r722 - x86/trunk/packages/glibc

justin at linuxfromscratch.org justin at linuxfromscratch.org
Fri Sep 23 00:00:07 PDT 2005


Author: justin
Date: 2005-09-23 01:00:04 -0600 (Fri, 23 Sep 2005)
New Revision: 722

Modified:
   x86/trunk/packages/glibc/Makefile
Log:
Dropped glibc back to 2.3.5 as in the lfs book.

Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile	2005-09-23 06:38:30 UTC (rev 721)
+++ x86/trunk/packages/glibc/Makefile	2005-09-23 07:00:04 UTC (rev 722)
@@ -2,54 +2,50 @@
 #==============================================================================
 
 NM= glibc
-VRS= 20050905
+VRS= 2.3.5
 DIR= $(NM)-$(VRS)
 
-FILE1= $(NM)-2.3.5.tar.bz2
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 2ee3ee261f11ab18359e994d3c40860c2b397c8a
+
+FILE1= $(NM)-linuxthreads-2.3.5.tar.bz2
 URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
-SHA-$(FILE1)= 2ee3ee261f11ab18359e994d3c40860c2b397c8a
+SHA-$(FILE1)= bfc44a76a708f905fe9c414162d5efcd3d47355f
 
-FILE2= $(NM)-linuxthreads-2.3.5.tar.bz2
-URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
-SHA-$(FILE2)= bfc44a76a708f905fe9c414162d5efcd3d47355f
-
-PATCH1= $(NM)-2.3.5-fix_test-1.patch
+PATCH1= $(DIR)-fix_test-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 40656faedabfa072c02225ba7d21fc0e76bbacb3
 
-PATCH2= $(NM)-2.3.5-gcc4_fix_symbols-1.patch
+PATCH2= $(DIR)-gcc4_fix_symbols-1.patch
 URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
 SHA-$(PATCH2)= 22d71f8368cb5de8f906b2aa50f7f27ff90a832a
 
-PATCH3= $(NM)-2.3.5-gcc4_fix_string-1.patch
+PATCH3= $(DIR)-gcc4_fix_string-1.patch
 URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
 SHA-$(PATCH3)= cd0888185c423fe50da823a8d3fa1abb55913bfa
 
-PATCH4= $(NM)-2.3.5-gcc4_fix_elf-1.patch
+PATCH4= $(DIR)-gcc4_fix_elf-1.patch
 URL-$(PATCH4)= $(HTTP)/$(NM)/$(PATCH4)
 SHA-$(PATCH4)= 5c648e3a7f7c6a80be60e4b7b99d0be915898803
 
-PATCH5= $(NM)-2.3.5-gcc4_fix_iconvdata-1.patch
+PATCH5= $(DIR)-gcc4_fix_iconvdata-1.patch
 URL-$(PATCH5)= $(HTTP)/$(NM)/$(PATCH5)
 SHA-$(PATCH5)= b03258c1869d7ddb9f41e920d1b4a19a8d860a7d
 
-PATCH6= $(NM)-2.3.5-gcc4_fix_math_tests-1.patch
+PATCH6= $(DIR)-gcc4_fix_math_tests-1.patch
 URL-$(PATCH6)= $(HTTP)/$(NM)/$(PATCH6)
 SHA-$(PATCH6)= 32f42c062a3a0bfa651cedf015988537ad88dcaa
 
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= a4f58791ea1cb1053ce1b7a1b749d3a3009599ca
-
 # Targets
 # =============================================================================
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(FILE1) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
+stage1: $(FILE) $(FILE1) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
 	@$(sep_dir_build)
 	@$(MAKE) clean
-	@cp $(SRC)/{$(FILE1),$(FILE2),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)} $(LFSSRC)/
+	@cp $(SRC)/{$(FILE),$(FILE1),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)} $(LFSSRC)/
 
 compile-stage1:
 	@$(call echo_message, Configuring)
@@ -91,7 +87,7 @@
 	@chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE) $(FILE1) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5) $(PATCH6)
+stage2: $(FILE) $(FILE1) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5) $(PATCH6)
 	@$(sep_dir_build)
 	@$(MAKE) clean
 	@cp $(SRC)/$(PATCH6) $(LFSSRC)/
@@ -129,8 +125,8 @@
 	@PARALLELMFLAGS="$(PM)" make install >>../$(DIR)-$@.log 2>&1
 	@PARALLELMFLAGS="$(PM)" make localedata/install-locales \
 	 >>../$(DIR)-$@.log 2>&1
-	@make -C ../$(DIR)/linuxthreads/man >>../$(NM)-20050905-$@.log 2>&1
-	@make -C ../$(DIR)/linuxthreads/man install >>../$(NM)-20050905-$@.log 2>&1
+	@make -C ../$(DIR)/linuxthreads/man >>../$(DIR)-$@.log 2>&1
+	@make -C ../$(DIR)/linuxthreads/man install >>../$(DIR)-$@.log 2>&1
 	@cp $(ROOT)/etc/nsswitch.conf /etc
 	@cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
 	@cp $(ROOT)/etc/ld.so.conf /etc




More information about the livecd mailing list