r670 - x86/trunk/packages/glibc

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Sep 18 09:15:58 PDT 2005


Author: jhuntwork
Date: 2005-09-18 10:15:53 -0600 (Sun, 18 Sep 2005)
New Revision: 670

Modified:
   x86/trunk/packages/glibc/Makefile
Log:
Decided to reverse the way $(DIR) is handled in glibc

Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile	2005-09-18 15:58:37 UTC (rev 669)
+++ x86/trunk/packages/glibc/Makefile	2005-09-18 16:15:53 UTC (rev 670)
@@ -2,42 +2,42 @@
 #==============================================================================
 
 NM= glibc
-VRS= 2.3.5
+VRS= 20050905
 DIR= $(NM)-$(VRS)
 
-FILE1= $(DIR).tar.bz2
+FILE1= $(NM)-2.3.5.tar.bz2
 URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
 SHA-$(FILE1)= 2ee3ee261f11ab18359e994d3c40860c2b397c8a
 
-FILE2= $(NM)-linuxthreads-$(VRS).tar.bz2
+FILE2= $(NM)-linuxthreads-2.3.5.tar.bz2
 URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
 SHA-$(FILE2)= bfc44a76a708f905fe9c414162d5efcd3d47355f
 
-PATCH1= $(DIR)-fix_test-1.patch
+PATCH1= $(NM)-2.3.5-fix_test-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 40656faedabfa072c02225ba7d21fc0e76bbacb3
 
-PATCH2= $(DIR)-gcc4_fix_symbols-1.patch
+PATCH2= $(NM)-2.3.5-gcc4_fix_symbols-1.patch
 URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
 SHA-$(PATCH2)= 22d71f8368cb5de8f906b2aa50f7f27ff90a832a
 
-PATCH3= $(DIR)-gcc4_fix_string-1.patch
+PATCH3= $(NM)-2.3.5-gcc4_fix_string-1.patch
 URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
 SHA-$(PATCH3)= cd0888185c423fe50da823a8d3fa1abb55913bfa
 
-PATCH4= $(DIR)-gcc4_fix_elf-1.patch
+PATCH4= $(NM)-2.3.5-gcc4_fix_elf-1.patch
 URL-$(PATCH4)= $(HTTP)/$(NM)/$(PATCH4)
 SHA-$(PATCH4)= 5c648e3a7f7c6a80be60e4b7b99d0be915898803
 
-PATCH5= $(DIR)-gcc4_fix_iconvdata-1.patch
+PATCH5= $(NM)-2.3.5-gcc4_fix_iconvdata-1.patch
 URL-$(PATCH5)= $(HTTP)/$(NM)/$(PATCH5)
 SHA-$(PATCH5)= b03258c1869d7ddb9f41e920d1b4a19a8d860a7d
 
-PATCH6= $(DIR)-gcc4_fix_math_tests-1.patch
+PATCH6= $(NM)-2.3.5-gcc4_fix_math_tests-1.patch
 URL-$(PATCH6)= $(HTTP)/$(NM)/$(PATCH6)
 SHA-$(PATCH6)= 32f42c062a3a0bfa651cedf015988537ad88dcaa
 
-FILE= $(NM)-20050905.tar.bz2
+FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= a4f58791ea1cb1053ce1b7a1b749d3a3009599ca
 
@@ -56,10 +56,10 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@../$(NM)-20050905/configure --prefix=$(WD) --disable-profile \
+	@../$(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 \
-	 >../$(NM)-20050905-$@.log 2>&1
+	 >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #
@@ -68,7 +68,7 @@
 #==============================================================================
 # Make commands below \/
 #==============================================================================
-	@PARALLELMFLAGS="$(PM)" make >>../$(NM)-20050905-$@.log 2>&1
+	@PARALLELMFLAGS="$(PM)" make >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #
@@ -78,7 +78,7 @@
 # Install commands below \/
 #==============================================================================
 	@touch $(WD)/etc/ld.so.conf
-	@PARALLELMFLAGS="$(PM)" make install >>../$(NM)-20050905-$@.log 2>&1
+	@PARALLELMFLAGS="$(PM)" make install >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #
@@ -99,9 +99,9 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@../$(NM)-20050905/configure --prefix=/usr --disable-profile \
+	@../$(DIR)/configure --prefix=/usr --disable-profile \
 	 --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \
-	 >../$(NM)-20050905-$@.log 2>&1
+	 >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #
@@ -110,7 +110,7 @@
 #==============================================================================
 # Make commands below \/
 #==============================================================================
-	@PARALLELMFLAGS="$(PM)" make >>../$(NM)-20050905-$@.log 2>&1
+	@PARALLELMFLAGS="$(PM)" make >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages===========================================
 #
@@ -120,11 +120,11 @@
 # Install commands below \/
 #==============================================================================
 	@touch /etc/ld.so.conf
-	@PARALLELMFLAGS="$(PM)" make install >>../$(NM)-20050905-$@.log 2>&1
+	@PARALLELMFLAGS="$(PM)" make install >>../$(DIR)-$@.log 2>&1
 	@PARALLELMFLAGS="$(PM)" make localedata/install-locales \
-	 >>../$(NM)-20050905-$@.log 2>&1
-	@make -C ../$(NM)-20050905/linuxthreads/man >>../$(NM)-20050905-$@.log 2>&1
-	@make -C ../$(NM)-20050905/linuxthreads/man install >>../$(NM)-20050905-$@.log 2>&1
+	 >>../$(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
 	@cp $(ROOT)/etc/nsswitch.conf /etc
 	@cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
 	@cp $(ROOT)/etc/ld.so.conf /etc
@@ -135,7 +135,7 @@
 
 	
 clean:
-	@-rm -rf $(NM)-20050905
+	@-rm -rf $(DIR)
 	@-rm -rf $(NM)-build
 
 .PHONY: compile-stage1 clean chroot compile-stage2




More information about the livecd mailing list