X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fglibc;h=f0d8aba647caeda0d2d636c4ab7f7e84bb51954a;hp=b09fcd66c56d07d91788b00a3196ed1b08877e9c;hb=6f67c28d995d1dcf08cd2b874fa02aef6e5dba00;hpb=9063a04e94587fc38f410ec2234275417de201ad

diff --git a/lfs/glibc b/lfs/glibc
index b09fcd66c..f0d8aba64 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -258,6 +258,16 @@ endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh970992.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh989558.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh989558-2.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh886968.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh905575.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh905874.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh916986.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh928318.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh947882.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh952422.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh966775.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh966778.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh970090.patch
 
 	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
@@ -281,28 +291,14 @@ endif
 	cd $(DIR_SRC)/glibc-build && \
 		CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
 		$(DIR_APP)/configure $(EXTRA_CONFIG)
-
-	sed -i $(DIR_SRC)/glibc-build/config.make \
-		-e "s/^build-pic-default=.*/build-pic-default=yes/"
-
-	# Build the glibc libraries without stack protection (as this is not supported)
-	echo "build-programs=no" >> $(DIR_SRC)/glibc-build/configparms
-	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
-		CFLAGS="$(CFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE" \
-		CXXFLAGS="$(CXXFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE"
-
-	# Build the programs with hardening
-	: > $(DIR_SRC)/glibc-build/configparms
 	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
-
 	cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 
 ifeq "$(ROOT)" ""
 	# Creating the locales
 	mkdir -p /usr/lib/locale
-	cd $(DIR_SRC)/glibc-build && localedef -i en_US -f ISO-8859-1 en_US
-	cd $(DIR_SRC)/glibc-build && localedef -i en_US -f UTF-8      en_US.utf8
+	cd $(DIR_SRC)/glibc-build && make localedata/install-locales
 
 	# Timezone data will be shipped by tzdata.
 	rm -rfv /usr/share/zoneinfo