Add patch to disable building nscd as PIE on hppa since PIE support is broken in glibc for parisc.

(Portage version: 2.0.51.22-r2)

7 files changed, 62 insertions, 6 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index fbd752ca294a..d65168789d7a 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.371 2005/07/26 23:17:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.372 2005/07/29 00:42:54 vapier Exp $
+
+  29 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.3.4/hppa-no-pie.patch, glibc-2.3.2-r12.ebuild,
+  glibc-2.3.3.20040420-r2.ebuild, glibc-2.3.4.20040619-r2.ebuild,
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102-r1.ebuild:
+  Add patch to disable building nscd as PIE on hppa since PIE support is
+  broken in glibc for parisc.
 
   26 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.5-r1.ebuild:
diff --git a/sys-libs/glibc/files/2.3.4/hppa-no-pie.patch b/sys-libs/glibc/files/2.3.4/hppa-no-pie.patch
new file mode 100644
index 000000000000..a91072c25ba4
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/hppa-no-pie.patch
@@ -0,0 +1,44 @@
+PIE support is broken on PARISC in this glibc so make sure we dont force
+building nscd as a PIE or bad things happen.
+
+--- nscd/Makefile
++++ nscd/Makefile
+@@ -35,7 +35,7 @@
+ ifeq ($(have-thread-library),yes)
+ 
+ others := nscd_nischeck
+-ifneq (yesyes,$(have-fpie)$(build-shared))
++ifneq (yes,$(build-shared))
+ others += nscd
+ endif
+ install-sbin := nscd nscd_nischeck
+@@ -60,27 +60,10 @@
+ CFLAGS-nscd_getgr_r.c = -fexceptions
+ CFLAGS-nscd_gethst_r.c = -fexceptions
+ 
+-ifeq (yesyes,$(have-fpie)$(build-shared))
+-CFLAGS-nscd.c = -fpie
+-CFLAGS-connections.c = -fpie
+-CFLAGS-pwdcache.c = -fpie
+-CFLAGS-getpwnam_r.c = -fpie
+-CFLAGS-getpwuid_r.c = -fpie
+-CFLAGS-grpcache.c = -fpie
+-CFLAGS-getgrnam_r.c = -fpie
+-CFLAGS-getgrgid_r.c = -fpie
+-CFLAGS-hstcache.c = -fpie
+-CFLAGS-gethstbyad_r.c = -fpie
+-CFLAGS-gethstbynm2_r.c = -fpie
+-CFLAGS-dbg_log.c = -fpie
+-CFLAGS-nscd_conf.c = -fpie
+-CFLAGS-nscd_stat.c = -fpie
+-CFLAGS-cache.c = -fpie
+-CFLAGS-xmalloc.c = -fpie
+-CFLAGS-xstrdup.c = -fpie
++ifeq (yes,$(build-shared))
+ 
+ $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
+-	$(LINK.o) -pie -Wl,-O1 \
++	$(LINK.o) -Wl,-O1 \
+ 	  $(sysdep-LDFLAGS) $(config-LDFLAGS) \
+ 	  $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
+ 	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
diff --git a/sys-libs/glibc/glibc-2.3.2-r12.ebuild b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
index bfd7474e3b6b..3a69b95afa69 100644
--- a/sys-libs/glibc/glibc-2.3.2-r12.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.15 2005/07/22 00:33:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.16 2005/07/29 00:42:54 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -426,6 +426,7 @@ src_unpack() {
 		cd ${WORKDIR}
 		unpack ${P}-hppa-patches-p1.tar.bz2
 		cd ${S}
+		epatch "${FILESDIR}"/files/2.3.4/hppa-no-pie.patch
 		EPATCH_EXCLUDE="010* 020* 030* 040* 050* 055*"
 		for i in ${EPATCH_EXCLUDE}
 		do
diff --git a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild
index 9a6406f4ee77..a4dd7d6da2e3 100644
--- a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.11 2005/07/09 21:11:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.12 2005/07/29 00:42:54 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -443,6 +443,7 @@ src_unpack() {
 		cd ${WORKDIR}
 		unpack ${LOCAL_P}-hppa-patches-p1.tar.bz2
 		cd ${S}
+		epatch "${FILESDIR}"/files/2.3.4/hppa-no-pie.patch
 		EPATCH_EXCLUDE="0[123459]0* 055* 1[2379]0* 200* 230*"
 		for x in ${EPATCH_EXCLUDE}
 		do
diff --git a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
index fe9a1e6b65fb..d9d80ed1140e 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.16 2005/07/09 21:11:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.17 2005/07/29 00:42:54 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -341,6 +341,7 @@ do_arch_hppa_patches() {
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
 	cd ${S}
+	epatch "${FILESDIR}"/files/2.3.4/hppa-no-pie.patch
 	export EPATCH_OPTS=-p1
 	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
 	do
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index 4d4d28e4a8bf..6ad2364cabd3 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.48 2005/07/09 21:11:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.49 2005/07/29 00:42:54 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -394,6 +394,7 @@ do_arch_hppa_patches() {
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
 	cd ${S}
+	epatch "${FILESDIR}"/files/2.3.4/hppa-no-pie.patch
 	export EPATCH_OPTS=-p1
 	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
 	do
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
index 2f246d09ff3b..3c4e387a2bff 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.18 2005/07/12 20:02:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r1.ebuild,v 1.19 2005/07/29 00:42:54 vapier Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs versionator
 
@@ -401,6 +401,7 @@ do_arch_hppa_patches() {
 	cd ${T}
 	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
 	cd ${S}
+	epatch "${FILESDIR}"/files/2.3.4/hppa-no-pie.patch
 	export EPATCH_OPTS=-p1
 	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
 	do