r438 - x86/trunk/packages/Xorg

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Jul 31 23:38:04 PDT 2005


Author: justin
Date: 2005-08-01 00:38:02 -0600 (Mon, 01 Aug 2005)
New Revision: 438

Modified:
   x86/trunk/packages/Xorg/Makefile
Log:
Updated Xorg Makefile.

Modified: x86/trunk/packages/Xorg/Makefile
===================================================================
--- x86/trunk/packages/Xorg/Makefile	2005-08-01 06:15:27 UTC (rev 437)
+++ x86/trunk/packages/Xorg/Makefile	2005-08-01 06:38:02 UTC (rev 438)
@@ -1,53 +1,81 @@
 # Xorg Makefile
+#==============================================================================
 
 # Package versions
 NM= Xorg
 VRS= 6.8.2
 DIR= xc
+
 FILE= X11R$(VRS)-src.tar.bz2
-PATCH= xorg-6.8.1-luit_race-1.patch
-URL= http://xorg.freedesktop.org/X11R$(VRS)/src-single/$(FILE)
-URL1= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH)
+URL-$(FILE)= $(HTTPBLFS)/Xorg/$(FILE)
+SHA-$(FILE)= 632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0
 
+PATCH1= xorg-6.8.1-luit_race-1.patch
+URL-$(FILE)= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH)
+SHA-$(FILE)= 2d211b65bcdcb7b926f392595d41fd177af8f818
 
+# Targets
+# =============================================================================
 
-#RULES
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-.PHONY: clean chroot stage2
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
-chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
-	@if [ ! -d /usr/include/X11 ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH) && \
-	 sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile && \
-	 pushd config/util && \
-	 make -f Makefile.ini lndir && \
-	 cp lndir /usr/bin/ && \
-	 popd && \
-	 mkdir ../$(DIR)build && cd ../$(DIR)build && lndir ../$(DIR) && \
-	 cp ../host.def config/cf/host.def && \
-	 sed -i -e "s@#include <linux/config.h>@/* & */@" `grep -lr linux/config.h *` && \
-	 ( make -j3 World 2>&1 | tee xorg-compile.log && exit $$PIPESTATUS ) && \
-	 make install && make install.man && \
-	 ln -sf ../X11R6/bin /usr/bin/X11 && \
-	 ln -sf ../X11R6/lib/X11 /usr/lib/X11 && \
-	 ln -sf ../X11R6/include/X11 /usr/include/X11 && \
-	 /sbin/ldconfig ; fi
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile
+	@pushd config/util
+	@make -f Makefile.ini lndir >../$(DIR)-$@.log 2>&1
+	@cp lndir /usr/bin/
+	@popd
+	@mkdir ../$(DIR)build
+	@cd ../$(DIR)build
+	@lndir -silent ../$(DIR)
+	@cp ../host.def config/cf/host.def
+	@sed -i -e "s@#include <linux/config.h>@/* & */@" `grep -lr linux/config.h *`
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make -j3 World >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+	@make install.man >>../$(DIR)-$@.log 2>&1
+	@ln -sf ../X11R6/bin /usr/bin/X11
+	@ln -sf ../X11R6/lib/X11 /usr/lib/X11
+	@ln -sf ../X11R6/include/X11 /usr/include/X11
+	@/sbin/ldconfig
 #	@echo "/tmp/.ICE-unix dir 1777 root root" >> /etc/sysconfig/createfiles
 	@echo -e "#!/bin/sh\nexec /usr/X11R6/bin/X -nolisten tcp" >/etc/X11/xinit/xserverrc
 	@chmod 755 /etc/X11/xinit/xserverrc
 	@install -m644 $(ROOT)/etc/X11/xorg.conf /etc/X11/xorg.conf
-	@cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf && \
-	 fc-cache
-	@make clean
+	@cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf
+	@fc-cache
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
 clean:
 	@-rm -rf $(DIR)
 	@-rm -rf $(DIR)build
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list