Author: jhuntwork
Date: 2005-09-18 09:36:32 -0600 (Sun, 18 Sep 2005)
New Revision: 666
Modified:
x86/trunk/packages/glibc/Makefile
Log:
Fixed a patch name in glibc, and swapped glibc-2.3.5 for 20050905 (at least
temporarily)
Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile 2005-09-18 13:20:36 UTC (rev 665)
+++ x86/trunk/packages/glibc/Makefile 2005-09-18 15:36:32 UTC (rev 666)
@@ -5,9 +5,9 @@
VRS= 2.3.5
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 2ee3ee261f11ab18359e994d3c40860c2b397c8a
+FILE1= $(DIR).tar.bz2
+URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
+SHA-$(FILE1)= 2ee3ee261f11ab18359e994d3c40860c2b397c8a
FILE2= $(NM)-linuxthreads-$(VRS).tar.bz2
URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
@@ -33,33 +33,29 @@
URL-$(PATCH5)= $(HTTP)/$(NM)/$(PATCH5)
SHA-$(PATCH5)= b03258c1869d7ddb9f41e920d1b4a19a8d860a7d
-PATCH6= $(DIR)--gcc4_fix_math_tests-1.patch
+PATCH6= $(DIR)-gcc4_fix_math_tests-1.patch
URL-$(PATCH6)= $(HTTP)/$(NM)/$(PATCH6)
SHA-$(PATCH6)= 32f42c062a3a0bfa651cedf015988537ad88dcaa
+FILE= $(NM)-20050905.tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= a4f58791ea1cb1053ce1b7a1b749d3a3009599ca
+
# Targets
# =============================================================================
include $(ROOT)/scripts/functions
-stage1: $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
+stage1: $(FILE) $(FILE1) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4)
$(PATCH5)
@$(sep_dir_build)
@$(MAKE) clean
- @cp
$(SRC)/{$(FILE),$(FILE2),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)}
$(LFSSRC)/
+ @cp
$(SRC)/{$(FILE1),$(FILE2),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)}
$(LFSSRC)/
compile-stage1:
@$(call echo_message, Configuring)
#==============================================================================
# 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
@../$(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 \
@@ -92,7 +88,7 @@
@chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
$(PATCH6)
+stage2: $(FILE) $(FILE1) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4)
$(PATCH5) $(PATCH6)
@$(sep_dir_build)
@$(MAKE) clean
@cp $(SRC)/$(PATCH6) $(LFSSRC)/
@@ -103,16 +99,6 @@
#==============================================================================
# Configure commands below \/
#==============================================================================
- @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
@../$(DIR)/configure --prefix=/usr --disable-profile \
--enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \
>../$(DIR)[EMAIL PROTECTED] 2>&1
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
