r450 - in x86/trunk/packages: LFS-BOOK Xorg autoconf automake bison docbook-xml docbook-xsl klibc

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Aug 1 04:17:55 PDT 2005


Author: jhuntwork
Date: 2005-08-01 05:17:50 -0600 (Mon, 01 Aug 2005)
New Revision: 450

Modified:
   x86/trunk/packages/LFS-BOOK/Makefile
   x86/trunk/packages/Xorg/Makefile
   x86/trunk/packages/autoconf/Makefile
   x86/trunk/packages/automake/Makefile
   x86/trunk/packages/bison/Makefile
   x86/trunk/packages/docbook-xml/Makefile
   x86/trunk/packages/docbook-xsl/Makefile
   x86/trunk/packages/klibc/Makefile
Log:
Minor fixes and updated klibc Makefile

Modified: x86/trunk/packages/LFS-BOOK/Makefile
===================================================================
--- x86/trunk/packages/LFS-BOOK/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/LFS-BOOK/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -2,10 +2,10 @@
 #==============================================================================
 
 NM= LFS-BOOK
-VRS= 6.1
+VRS= trunk
 DIR= $(NM)-$(VRS)-HTML
 
-URL= svn://svn.linuxfromscratch.org/LFS/branches/$(VRS)/BOOK
+URL= svn://svn.linuxfromscratch.org/LFS/$(VRS)/BOOK
 
 # Targets
 # =============================================================================

Modified: x86/trunk/packages/Xorg/Makefile
===================================================================
--- x86/trunk/packages/Xorg/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/Xorg/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -48,7 +48,7 @@
 #==============================================================================
 # Make commands below \/
 #==============================================================================
-	@make -j3 World >>../$(DIR)-$@.log 2>&1
+	@make $(PM) World >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages===========================================
 #
@@ -63,7 +63,6 @@
 	@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

Modified: x86/trunk/packages/autoconf/Makefile
===================================================================
--- x86/trunk/packages/autoconf/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/autoconf/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -16,7 +16,7 @@
 
 chroot:
 	@chroot "$(MP)" $(chenv-pre-bash) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2: Makefile $(FILE)
 	@$(std_build)

Modified: x86/trunk/packages/automake/Makefile
===================================================================
--- x86/trunk/packages/automake/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/automake/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -4,6 +4,7 @@
 NM= automake
 VRS= 1.9.6
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= d205dbb274d3ff5be1cf6734f27fb452c7131866
@@ -52,4 +53,4 @@
 clean:
 	@-rm -rf $(DIR)
 
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/bison/Makefile
===================================================================
--- x86/trunk/packages/bison/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/bison/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -14,39 +14,6 @@
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE)
-	@$(std_build) 
-	@cp $(SRC)/$(FILE) $(LFSSRC)
-
-compile-stage1:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@./configure --prefix=$(WD) >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-
 chroot:
 	@chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
@@ -86,4 +53,4 @@
 clean:
 	@-rm -rf $(DIR)
 
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/docbook-xml/Makefile
===================================================================
--- x86/trunk/packages/docbook-xml/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/docbook-xml/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -26,7 +26,7 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
-	@../install
+	@../install >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages===========================================
 #

Modified: x86/trunk/packages/docbook-xsl/Makefile
===================================================================
--- x86/trunk/packages/docbook-xsl/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/docbook-xsl/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -26,7 +26,7 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
-	@../install
+	@../install >../$(DIR)-$@.log 2>&1
 	@ln -s xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current
 #
 #==Status Messages===========================================

Modified: x86/trunk/packages/klibc/Makefile
===================================================================
--- x86/trunk/packages/klibc/Makefile	2005-08-01 09:06:05 UTC (rev 449)
+++ x86/trunk/packages/klibc/Makefile	2005-08-01 11:17:50 UTC (rev 450)
@@ -1,32 +1,62 @@
 # Klibc Makefile
+#==============================================================================
 
-# Package versions
 NM= klibc
 VRS= 1.0
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-halt-1.patch
-URL= http://www.kernel.org/pub/linux/libs/$(NM)/$(FILE)
+URL-$(FILE)= http://www.kernel.org/pub/linux/libs/$(NM)/$(FILE)
+SHA-$(FILE)= 45723d115503ad1e8311fa38e75a66c7204adb5a
 
-# RULES
+PATCH1= $(DIR)-halt-1.patch
+SHA-$(PATCH1)= e5b4d525e80b1c54770cdccfbc86329d565ed205
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@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 [ ! -d /usr/lib/klibc ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH) && \
-	 ln -nsf /usr/src/linux-$(KVERS) linux && make && make install && \
-	 make -C ../../util-linux klibc-losetup && \
-	 make -C ../../isoinfo klibc-isoinfo ; fi
-	@make clean
-	
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@ln -nsf /usr/src/linux-$(KVERS) linux 
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@make -C ../../util-linux klibc-losetup
+	@make -C ../../isoinfo klibc-isoinfo
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list