Author: justin
Date: 2005-11-26 22:42:24 -0700 (Sat, 26 Nov 2005)
New Revision: 1170

Modified:
   branches/6.1.1-newmake/packages/glibc/Makefile
Log:
Added glibc tls_assert patch to 6.1.1-newmake branch.

Modified: branches/6.1.1-newmake/packages/glibc/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/glibc/Makefile      2005-11-27 05:25:24 UTC 
(rev 1169)
+++ branches/6.1.1-newmake/packages/glibc/Makefile      2005-11-27 05:42:24 UTC 
(rev 1170)
@@ -20,6 +20,10 @@
 URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
 SHA-$(PATCH2)= 240e2e5673c3ddb773de99ff7a060b9c0789d90d
 
+PATCH3= $(DIR)-tls_assert-1.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= 41d86f9646521159151a7bf465a24a08905a7b47
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -41,15 +45,16 @@
        chroot "$(MP)" $(chenv-pre-bash) \
        'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE) $(FILE1) $(PATCH2)
+stage2: $(FILE) $(FILE1) $(PATCH2) $(PATCH3)
        $(sep_dir_build)
-       cp $(SRC)/$(PATCH2) $(LFSSRC)
+       cp $(SRC)/{$(PATCH2),$(PATCH3)} $(LFSSRC)
        touch $@
 
 compile-stage2:
        cd ../$(DIR) ; unpack ../$(FILE1)
        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2)
        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+       cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3)
        ../$(DIR)/configure --prefix=/usr --disable-profile \
         --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
        PARALLELMFLAGS="$(PM)" make

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to