X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fglibc;h=234a7ce11733179aa5c7c394869f53e8862f0404;hb=4a8dc4556aed707286cf3930f57d62362d85a6f8;hp=f2553e98af27160280d0f9798d6f2d0461de87d8;hpb=c51823b2c4e4d815cb439c1c7b9bc6c9896916b8;p=ipfire-2.x.git

diff --git a/lfs/glibc b/lfs/glibc
index f2553e98af..234a7ce117 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -237,14 +237,13 @@ endif
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-nss_test1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch
 
 	# Fixes:
 	#   Makefile:235: *** mixed implicit and normal rules.  Stop.
 	cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile
 
-	# Fix an issue when building glibc with gcc 4.7.
-	#cd $(DIR_APP) && sed -i "s/ -lgcc_s//" Makeconfig
-
 ifeq "$(ROOT)" ""
 ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \