r1297 - trunk/packages/Xorg-modular

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Fri Dec 23 02:57:01 PST 2005


Author: alexander
Date: 2005-12-23 03:56:59 -0700 (Fri, 23 Dec 2005)
New Revision: 1297

Modified:
   trunk/packages/Xorg-modular/EXCUSES
   trunk/packages/Xorg-modular/Makefile
Log:
Built libraries
Fixed unpacking (libXtst was unpacked instead of libXt)
Added logging of ./conigure --help


Modified: trunk/packages/Xorg-modular/EXCUSES
===================================================================
--- trunk/packages/Xorg-modular/EXCUSES	2005-12-23 06:11:06 UTC (rev 1296)
+++ trunk/packages/Xorg-modular/EXCUSES	2005-12-23 10:56:59 UTC (rev 1297)
@@ -1,2 +1,8 @@
 applewmproto: relevant only for Mac OS. Not installed by X.org 6.9.0
+printproto: LFS LiveCD doesn't support printing
 windowswmproto: relevant only for MS Windows. Not installed by X.org 6.9.0
+libAppleWM: relevant only for Mac OS. Not installed by X.org 6.9.0
+libWindowsWM: relevant only for MS Windows. Not installed by X.org 6.9.0
+libXp: LFS LiveCD doesn't support printing
+libXprintUtil: LFS LiveCD doesn't support printing
+libXprintAppUtil: LFS LiveCD doesn't support printing

Modified: trunk/packages/Xorg-modular/Makefile
===================================================================
--- trunk/packages/Xorg-modular/Makefile	2005-12-23 06:11:06 UTC (rev 1296)
+++ trunk/packages/Xorg-modular/Makefile	2005-12-23 10:56:59 UTC (rev 1297)
@@ -10,7 +10,7 @@
 	ln -sf `awk '/^[^#]/{print "/$(SRC)/"$$2 }' SHA1SUMS` .
 	@touch $@
 
-stage2: Makefile download symlinks utils proto
+stage2: Makefile download symlinks utils proto lib
 	@touch $@
 
 symlinks: Makefile
@@ -26,7 +26,7 @@
 proto:	N-applewmproto Y-bigreqsproto \
 	Y-compositeproto Y-damageproto Y-dmxproto Y-evieext Y-fixesproto \
 	Y-fontcacheproto Y-fontsproto Y-glproto \
-	Y-inputproto Y-kbproto Y-printproto Y-randrproto Y-recordproto \
+	Y-inputproto Y-kbproto N-printproto Y-randrproto Y-recordproto \
 	Y-renderproto Y-resourceproto Y-scrnsaverproto Y-trapproto \
 	Y-videoproto N-windowswmproto Y-xcmiscproto Y-xextproto \
 	Y-xf86bigfontproto Y-xf86dgaproto Y-xf86driproto Y-xf86miscproto \
@@ -34,6 +34,16 @@
 	Y-xproto Y-xproxymanagementprotocol
 	@touch $@
 
+lib:	Y-xtrans Y-libXau Y-libXdmcp Y-libX11 Y-libXext N-libAppleWM \
+	N-libWindowsWM Y-libdmx Y-libfontenc Y-libFS Y-libICE Y-liblbxutil \
+	Y-liboldX Y-libSM Y-libXt Y-libXmu Y-libXpm N-libXp Y-libXaw \
+	Y-libXfixes Y-libXcomposite Y-libXrender Y-libXdamage Y-libXcursor \
+	Y-libXevie Y-libXfont Y-libXfontcache Y-libXft Y-libXi Y-libXinerama \
+	Y-libxkbfile Y-libxkbui N-libXprintUtil N-libXprintAppUtil \
+	Y-libXrandr Y-libXres Y-libXScrnSaver Y-libXTrap Y-libXtst Y-libXv \
+	Y-libXvMC Y-libXxf86dga Y-libXxf86misc Y-libXxf86vm
+	@touch $@
+
 N-%:
 	@$(call echo_message, NOT building)
 	@grep '^$*' EXCUSES
@@ -41,7 +51,7 @@
 
 Y-%: SHA1SUMS
 	@$(call echo_message, Building)
-	@make y-$* FILE=`awk '/ $*/{print $$2}' SHA1SUMS` >$@.log 2>&1
+	@make y-$* FILE=`awk '/ $*-/{print $$2}' SHA1SUMS` >$@.log 2>&1
 	@touch $@
 
 y-%:
@@ -53,6 +63,7 @@
 	# Extra safety measure, due to "test: too many arguments" messages
 	# May well be just an unnecessary precaution
 	autoreconf --force --install --verbose
+	./configure --help
 	./configure --prefix=/usr --localstatedir=/var
 	make $(PM)
 	make DESTDIR=$(ROOT)/debug/$* install




More information about the livecd mailing list