X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fglibc;h=234a7ce11733179aa5c7c394869f53e8862f0404;hb=274054142e3033aabf5cb1b89d86fa430dee5d72;hp=d3590d80f3e4d807bf6a8b3d6ed1edd5854b4fa3;hpb=9572596c47e961c6f4d970b4c4c72bd5f90920e0;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/glibc b/lfs/glibc
index d3590d80f..234a7ce11 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -57,14 +57,13 @@ else
 endif
 
 # Enable some extra optimization for the glibc code.
-export CFLAGS := -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC \
+CFLAGS = -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC \
 	-DNO_CTORS_DTORS_SECTIONS
 
 ifeq "$(MACHINE)" "i586"
 	CFLAGS += -march=i586 -mtune=generic -mno-tls-direct-seg-refs
 endif
 
-
 ifeq "$(MACHINE_TYPE)" "arm"
 	# Disable hardware FP for ARM.
 	EXTRA_CONFIG += \
@@ -130,6 +129,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(MACHINE_TYPE)" "arm"
 	cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(PORTS_VER).tar.bz2
 	cd $(DIR_APP) && mv -v glibc-ports-$(PORTS_VER) ports
+
+	# http://sourceware.org/bugzilla/show_bug.cgi?id=12354
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-cfi-entry-not-closed.patch
 endif
 
 	# Apply all patches.
@@ -234,17 +236,14 @@ endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh837026.patch
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
-	# http://sourceware.org/bugzilla/show_bug.cgi?id=12354
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-cfi-entry-not-closed.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|' \
@@ -259,7 +258,7 @@ endif
 		CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
 		$(DIR_APP)/configure $(EXTRA_CONFIG)
 	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
-		CFLAFS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 	cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 
 ifeq "$(ROOT)" ""