r389 - in x86/trunk/packages: gcc glibc

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 19 20:59:53 PDT 2005


Author: jhuntwork
Date: 2005-07-19 21:59:52 -0600 (Tue, 19 Jul 2005)
New Revision: 389

Modified:
   x86/trunk/packages/gcc/Makefile
   x86/trunk/packages/glibc/Makefile
Log:
Fixes to gcc and glibc

Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile	2005-07-20 03:05:20 UTC (rev 388)
+++ x86/trunk/packages/gcc/Makefile	2005-07-20 03:59:52 UTC (rev 389)
@@ -29,6 +29,7 @@
 
 pass1: $(FILE)
 	@$(sep_dir_build)
+	@$(MAKE) clean
 	@cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-pass1:
@@ -57,7 +58,7 @@
 # Install commands below \/
 #==============================================================================
 	@make install >>../$(DIR)-$@.log 2>&1
-	ln -s gcc $(WD)/bin/cc
+	@ln -s gcc $(WD)/bin/cc
 #
 #==Status Messages==========================================
 #
@@ -65,8 +66,8 @@
 
 pass2: $(FILE) $(PATCH1) $(PATCH2)
 	@$(sep_dir_build)
-	@cp $(SRC)/$(PATCH1) $(LFSSRC)/
-	@cp $(SRC)/$(PATCH2) $(LFSSRC)/
+	@$(MAKE) clean
+	@cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
 
 compile-pass2:
 	@$(call echo_message, Configuring)
@@ -109,6 +110,7 @@
 
 stage2: $(FILE) $(PATCH1) $(PATCH3)
 	@$(sep_dir_build)
+	@$(MAKE) clean
 	@cp $(SRC)/$(PATCH3) $(LFSSRC)/
 
 compile-stage2:
@@ -150,6 +152,6 @@
 	
 clean:
 	@-rm -rf $(DIR)
-	@-rf -rf $(NM)-build
+	@-rm -rf $(NM)-build
 
 .PHONY: compile-pass1 clean chroot compile-pass2 compile-stage2

Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile	2005-07-20 03:05:20 UTC (rev 388)
+++ x86/trunk/packages/glibc/Makefile	2005-07-20 03:59:52 UTC (rev 389)
@@ -24,14 +24,15 @@
 
 stage1: $(FILE) $(PATCH1)
 	@$(sep_dir_build)
-	@cp $(SRC)/$(FILE) $(LFSSRC)/
+	@$(MAKE) clean
+	@cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)/
 
 compile-stage1:
 	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@patch -Np1 -i ../$(PATCH1)
+	@cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
 	@../$(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 \
@@ -53,7 +54,7 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
-	@mkdir $(WD)/etc ; touch $(WD)/etc/ld.so.conf
+	@touch $(WD)/etc/ld.so.conf
 	@PARALLELMFLAGS="$(PM)" make install >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
@@ -65,11 +66,7 @@
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2: $(FILE) $(FILE2) $(PATCH1)
-	@unpack $(FILE)
-	@cd $(DIR) ; unpack $(FILE2)
-	@rm -rf $(NM)-build
-	@mkdir $(NM)-build
-	@$(MAKE) -C $(NM)-build -f ../Makefile compile-$@
+	@$(sep_build_dir)
 	@$(MAKE) clean
 	@touch $@
 
@@ -78,7 +75,7 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@patch -Np1 -i ../$(PATCH1)
+	@cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) ; unpack $(FILE2)
 	@../$(DIR)/configure --prefix=/usr --disable-profile \
 	 --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \
 	 >../$(DIR)-$@.log 2>&1
@@ -116,6 +113,6 @@
 	
 clean:
 	@-rm -rf $(DIR)
-	@-rf -rf $(NM)-build
+	@-rm -rf $(NM)-build
 
 .PHONY: compile-stage1 clean chroot compile-stage2




More information about the livecd mailing list