r651 - x86/trunk/packages/glibc

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Sep 17 16:26:17 PDT 2005


Author: jhuntwork
Date: 2005-09-17 17:26:16 -0600 (Sat, 17 Sep 2005)
New Revision: 651

Modified:
   x86/trunk/packages/glibc/Makefile
Log:
Updated glibc to work with gcc4

Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile	2005-09-17 12:37:58 UTC (rev 650)
+++ x86/trunk/packages/glibc/Makefile	2005-09-17 23:26:16 UTC (rev 651)
@@ -17,15 +17,35 @@
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 40656faedabfa072c02225ba7d21fc0e76bbacb3
 
+PATCH2= $(DIR)-gcc4_fix_symbols-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 22d71f8368cb5de8f906b2aa50f7f27ff90a832a
+
+PATCH3= $(DIR)-gcc4_fix_string-1.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= cd0888185c423fe50da823a8d3fa1abb55913bfa
+
+PATCH4= $(DIR)-gcc4_fix_elf-1.patch
+URL-$(PATCH4)= $(HTTP)/$(NM)/$(PATCH4)
+SHA-$(PATCH4)= 5c648e3a7f7c6a80be60e4b7b99d0be915898803
+
+PATCH5= $(DIR)-gcc4_fix_iconvdata-1.patch
+URL-$(PATCH5)= $(HTTP)/$(NM)/$(PATCH5)
+SHA-$(PATCH5)= b03258c1869d7ddb9f41e920d1b4a19a8d860a7d
+
+PATCH6= $(DIR)--gcc4_fix_math_tests-1.patch
+URL-$(PATCH6)= $(HTTP)/$(NM)/$(PATCH6)
+SHA-$(PATCH6)= 32f42c062a3a0bfa651cedf015988537ad88dcaa
+
 # Targets
 # =============================================================================
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(PATCH1) $(FILE2)
+stage1: $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
 	@$(sep_dir_build)
 	@$(MAKE) clean
-	@cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1)} $(LFSSRC)/
+	@cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1,$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5))} $(LFSSRC)/
 
 compile-stage1:
 	@$(call echo_message, Configuring)
@@ -33,6 +53,10 @@
 # Configure commands below \/
 #==============================================================================
 	@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)
 ifeq ($(ARCH),sparc)
 	@cd ../$(DIR) ; unpack ../$(FILE2) ; rm -rf nptl*
 endif
@@ -68,9 +92,10 @@
 	@chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE) $(FILE2) $(PATCH1)
+stage2: $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5) $(PATCH6)
 	@$(sep_dir_build)
 	@$(MAKE) clean
+	@cp $(SRC)/$(PATCH6) $(LFSSRC)/
 	@touch $@
 
 compile-stage2:
@@ -78,7 +103,13 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) ; unpack ../$(FILE2)
+	@cd ../$(DIR) ; unpack ../$(FILE2)
+	@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)
 ifeq ($(ARCH),sparc)
 	@rm -rf ../$(DIR)/nptl*
 endif




More information about the livecd mailing list