r726 - in x86/trunk/packages: binutils gcc glibc linux-libc-headers

justin at linuxfromscratch.org justin at linuxfromscratch.org
Fri Sep 23 15:02:36 PDT 2005


Author: justin
Date: 2005-09-23 16:02:34 -0600 (Fri, 23 Sep 2005)
New Revision: 726

Modified:
   x86/trunk/packages/binutils/Makefile
   x86/trunk/packages/gcc/Makefile
   x86/trunk/packages/glibc/Makefile
   x86/trunk/packages/linux-libc-headers/Makefile
Log:
Updated trunk to LFS development version up to chapter 5 glibc.

Modified: x86/trunk/packages/binutils/Makefile
===================================================================
--- x86/trunk/packages/binutils/Makefile	2005-09-23 13:20:50 UTC (rev 725)
+++ x86/trunk/packages/binutils/Makefile	2005-09-23 22:02:34 UTC (rev 726)
@@ -24,35 +24,26 @@
 	@cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-pass1:
-	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+        @$(call echo_message, Configuring)
 	@../$(DIR)/configure --prefix=$(WD) --disable-nls >../$(DIR)-$@.log \
 	2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+        @$(call echo_message, Making)
 	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 	@make install >>../$(DIR)-$@.log 2>&1
 	@make -C ld clean >>../$(DIR)-$@.log 2>&1
 	@make -C ld LIB_PATH=$(WD)/lib >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
 
 adjust-toolchain:
@@ -71,41 +62,31 @@
 	 cd .. && make clean ; fi
 	@touch $@
 
-
 pass2: $(FILE)
 	@$(sep_dir_build)
 
-
 compile-pass2:
-	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+        @$(call echo_message, Configuring)
 	@../$(DIR)/configure --prefix=$(WD) --disable-nls \
 	 --enable-shared --with-lib-path=$(WD)/lib >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
 	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+        @$(call echo_message, Making)
 	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 	@make install >>../$(DIR)-$@.log 2>&1
 	@make -C ld clean >>../$(DIR)-$@.log 2>&1
 	@make -C ld LIB_PATH=/usr/lib:/lib >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
 	@$(OK)
 
 chroot-re-adjust-toolchain:
@@ -132,38 +113,27 @@
 	@$(sep_dir_build)
 
 compile-stage2:
-	$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+        @$(call echo_message, Configuring)
 	@../$(DIR)/configure --prefix=/usr --enable-shared >../$(DIR)-$@.log \
 	 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+        @$(call echo_message, Making)
 	@make $(PM) tooldir=/usr >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 	@make tooldir=/usr install >>../$(DIR)-$@.log 2>&1
 	@cp ../$(DIR)/include/libiberty.h /usr/include
-
-#
-#==Status Messages===========================================
-#
 	@$(OK)
 
-	
 clean:
 	@-rm -rf $(DIR)
 	@-rm -rf $(NM)-build

Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile	2005-09-23 13:20:50 UTC (rev 725)
+++ x86/trunk/packages/gcc/Makefile	2005-09-23 22:02:34 UTC (rev 726)
@@ -13,7 +13,6 @@
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 04d4b7d68bfd6b362e9b75678584641a2dde7c2f
 
-
 # Targets
 # =============================================================================
 
@@ -25,35 +24,26 @@
 	@cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-pass1:
-	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+        @$(call echo_message, Configuring)
 	@../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
 	 --with-local-prefix=$(WD) --disable-nls --enable-shared \
 	 --enable-languages=c >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+        @$(call echo_message, Making)
 	@make $(PM) bootstrap >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 	@make install >>../$(DIR)-$@.log 2>&1
 	@ln -s gcc $(WD)/bin/cc
-#
-#==Status Messages==========================================
-#
 	@$(OK)
 
 pass2: $(FILE) $(PATCH1)
@@ -62,10 +52,10 @@
 	@cp $(SRC)/$(PATCH1) $(LFSSRC)/
 
 compile-pass2:
-	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+        @$(call echo_message, Configuring)
 	@cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} && \
 	 sed 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 $(WD)/include at g' \
 	 gcc/Makefile.in.orig > gcc/Makefile.in
@@ -77,28 +67,18 @@
 	 --with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \
 	 --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \
 	 --disable-libstdcxx-pch >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+        @$(call echo_message, Making)
 	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 	@make install >>../$(DIR)-$@.log 2>&1
-
-#
-#==Status Messages===========================================
-#
 	@$(OK)
 
 chroot:
@@ -110,10 +90,10 @@
 	@$(MAKE) clean
 
 compile-stage2:
-	$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+        @$(call echo_message, Configuring)
 	@cd ../$(DIR) ; sed -i 's/install_to_$(INSTALL_DEST) //' \
 	 libiberty/Makefile.in
 	@cd ../$(DIR) ; sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' \
@@ -121,32 +101,22 @@
 	@../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
 	 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
 	 --enable-clocale=gnu --enable-languages=c,c++ >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+	@$(call echo_message, Making)
 	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+	@$(call echo_message, Installing)
 	@make install >>../$(DIR)-$@.log 2>&1
 	@ln -sf ../usr/bin/cpp /lib
 	@ln -sf gcc /usr/bin/cc
-#
-#==Status Messages===========================================
-#
 	@$(OK)
 
-	
 clean:
 	@-rm -rf $(DIR)
 	@-rm -rf $(NM)-build

Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile	2005-09-23 13:20:50 UTC (rev 725)
+++ x86/trunk/packages/glibc/Makefile	2005-09-23 22:02:34 UTC (rev 726)
@@ -48,39 +48,36 @@
 	@cp $(SRC)/{$(FILE),$(FILE1),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)} $(LFSSRC)/
 
 compile-stage1:
-	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+	@$(call echo_message, Configuring)
 ifeq ($(ARCH),sparc)
 	@cd ../$(DIR) ; rm -rf nptl*
 endif
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2)
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3)
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4)
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5)
 	@../$(DIR)/configure --prefix=$(WD) --disable-profile \
 	 --enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
 	 --without-gd --with-headers=$(WD)/include --without-selinux \
 	 >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+        @$(call echo_message, Making)
 	@PARALLELMFLAGS="$(PM)" make >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
+	@mkdir $(WD)/etc
 	@touch $(WD)/etc/ld.so.conf
 	@PARALLELMFLAGS="$(PM)" make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
 
 chroot:
@@ -94,33 +91,33 @@
 	@touch $@
 
 compile-stage2:
-	$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+        @$(call echo_message, Configuring)
 ifeq ($(ARCH),sparc)
 	@cd ../$(DIR) ; rm -rf nptl*
 endif
+        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2)
+        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3)
+        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4)
+        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5)
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH6)
 	@../$(DIR)/configure --prefix=/usr --disable-profile \
 	 --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \
 	 >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
-	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+        @$(call echo_message, Making)
 	@PARALLELMFLAGS="$(PM)" make >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
 	@$(OK)
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 	@touch /etc/ld.so.conf
 	@PARALLELMFLAGS="$(PM)" make install >>../$(DIR)-$@.log 2>&1
 	@PARALLELMFLAGS="$(PM)" make localedata/install-locales \
@@ -130,12 +127,8 @@
 	@cp $(ROOT)/etc/nsswitch.conf /etc
 	@cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
 	@cp $(ROOT)/etc/ld.so.conf /etc
-#
-#==Status Messages===========================================
-#
 	@$(OK)
 
-	
 clean:
 	@-rm -rf $(DIR)
 	@-rm -rf $(NM)-build

Modified: x86/trunk/packages/linux-libc-headers/Makefile
===================================================================
--- x86/trunk/packages/linux-libc-headers/Makefile	2005-09-23 13:20:50 UTC (rev 725)
+++ x86/trunk/packages/linux-libc-headers/Makefile	2005-09-23 22:02:34 UTC (rev 726)
@@ -19,10 +19,10 @@
 	@cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage1:
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 ifeq ($(ARCH),x86)
 	@cp -Rv include/asm-i386 $(WD)/include/asm >../$(DIR)-$@.log 2>&1
 endif
@@ -33,9 +33,6 @@
 	@cp -Rv include/asm-sparc $(WD)/include/asm >../$(DIR)-$@.log 2>&1
 endif
 	@cp -Rv include/linux $(WD)/include >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
 	@$(OK)
 
 chroot:
@@ -46,10 +43,10 @@
 	@$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Installing)
 #==============================================================================
 # Install commands below \/
 #==============================================================================
+        @$(call echo_message, Installing)
 ifeq ($(ARCH),x86)
 	@cp -Rv include/asm-i386 /usr/include/asm >../$(DIR)-$@.log 2>&1
 endif
@@ -63,9 +60,6 @@
 	@chown -R root:root /usr/include/{asm,linux}
 	@find /usr/include/{asm,linux} -type d -exec chmod 755 {} \;
 	@find /usr/include/{asm,linux} -type d -exec chmod 644 {} \;
-#
-#==Status Messages===========================================
-#
 	@$(OK)
 
 clean:




More information about the livecd mailing list