From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 4 Dec 2004 03:17:33 +0000 (+0000)
Subject: more cross-compile tweaks
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b51c3cef8421a4f4b2bc599cfb51f4526f7f23d;p=gentoo.git

more cross-compile tweaks
---

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6b8f0a326ab5..2db376da482b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -7,8 +7,8 @@ MD5 e4f211c5762191a6fce67b15caf38c31 glibc-2.3.2-r12.ebuild 20537
 MD5 d59fdfb3aca88476d792b71922c765a5 glibc-2.3.3.20040420-r2.ebuild 21630
 MD5 48dcbf88afd15efb62b4313337261968 glibc-2.3.4.20040619-r2.ebuild 21077
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 0337c379042671fe6d09271a287b3f04 glibc-2.3.4.20040808-r1.ebuild 22512
-MD5 f35a6db16ef2ed743974f94ca8d7365d glibc-2.3.4.20041102.ebuild 27271
+MD5 d88fb76a3bc6988aa299a87dce226e4f glibc-2.3.4.20040808-r1.ebuild 22823
+MD5 acd92ae15d9a6fe0c7f35cee6b13dd67 glibc-2.3.4.20041102.ebuild 27582
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
@@ -137,7 +137,7 @@ MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBsJnuroRuSHgZdywRAka6AJ9TPfywB3qvpBtlM5HcPzBAyzUwJwCfcGv7
-7T7W1GDOuPZKrh3mTgKnks4=
-=9MZc
+iD8DBQFBsSxkroRuSHgZdywRAmCEAJ92S/67JHrM9/jwyKjsJyR7A+g0ngCcDKnO
+a75it87akwilkQ+nOWEAHNw=
+=sOJc
 -----END PGP SIGNATURE-----
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 323276cb15b7..f06e34e01cb5 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-2004 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.14 2004/12/03 16:52:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.15 2004/12/04 03:17:33 vapier Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -448,7 +448,7 @@ do_ssp_patches() {
 	# __guard_setup__stack_smash_handler
 	#
 	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ]; then
+	if use hppa ; then
 		epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
 		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
 			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
@@ -496,6 +496,14 @@ src_unpack() {
 	# disable binutils -as-needed
 	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
 
+	# Glibc is stupid sometimes, and doesn't realize that with a 
+	# static C-Only gcc, -lgcc_eh doesn't exist.
+	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
+	echo 'int main(){}' > ${T}/gcc_eh_test.c
+	if ! $(tc-getCC) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
+		sed -i -e '/static-gnulib := /s:-lgcc -lgcc_eh:-lgcc:' Makeconfig
+	fi
+
 	# hardened toolchain/relro/nptl/security/etc fixes
 	do_hardened_fixes
 
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index e6dd1c95ccf3..8065e42f2baf 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.8 2004/12/03 16:52:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.9 2004/12/04 03:17:33 vapier Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -447,7 +447,7 @@ do_ssp_patches() {
 	# __guard_setup__stack_smash_handler
 	#
 	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ]; then
+	if use hppa ; then
 		epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
 		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
 			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
@@ -520,6 +520,14 @@ src_unpack() {
 	# disable binutils -as-needed
 	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
 
+	# Glibc is stupid sometimes, and doesn't realize that with a 
+	# static C-Only gcc, -lgcc_eh doesn't exist.
+	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
+	echo 'int main(){}' > ${T}/gcc_eh_test.c
+	if ! $(tc-getCC) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
+		sed -i -e '/static-gnulib := /s:-lgcc -lgcc_eh:-lgcc:' Makeconfig
+	fi
+
 	# hardened toolchain/relro/nptl/security/etc fixes
 	do_hardened_fixes