gcc-4 fix from bug #83403. Fixes for when CBUILD != CHOST.

(Portage version: 2.0.51.19)

4 files changed, 12 insertions, 19 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index f97595281098..3613e250de74 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.324 2005/03/07 11:33:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.325 2005/03/15 20:00:21 eradicator Exp $
+
+  15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20050125-r1.ebuild:
+  gcc-4 fix from bug #83403.  Fixes for when CBUILD != CHOST.
 
   07 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.4.20050125-r1.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c51f71159917..4e353194fc1e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a75aa46fc0e8d26a7955517dfa046a40 ChangeLog 69361
 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915
 MD5 19b845756fd8e974c113e904396b9627 glibc-2.3.2-r12.ebuild 22153
@@ -11,7 +8,7 @@ MD5 ab06008394eb7c6aa17a674cae788eef glibc-2.3.4.20041102.ebuild 32888
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 b85c16a0e65a32784335e40fb0edac0e glibc-2.2.5-r10.ebuild 4418
 MD5 695f1e83d1cb212d83d97f0d2989cb94 glibc-2.3.4.20050125.ebuild 35240
-MD5 fda83f7de7976c3ec4f09da42ec5c8db glibc-2.3.4.20050125-r1.ebuild 37455
+MD5 92fed52e8641fae42843110dbdb2dbe0 glibc-2.3.4.20050125-r1.ebuild 37479
 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
@@ -33,7 +30,7 @@ MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
 MD5 5f2690b0a60b336ec8f26fa3a8898361 files/digest-glibc-2.3.4.20050125 371
 MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290
-MD5 cadbf4dc76ae7f9014540c0999b391f3 files/digest-glibc-2.3.4.20050125-r1 521
+MD5 a9de295b411a75b97cd07e0408055c33 files/digest-glibc-2.3.4.20050125-r1 521
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
@@ -142,10 +139,3 @@ MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-f
 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
 MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCMOESArHZZzCEUG0RAq+UAJ9xNxZVEUp5vAEG4hETOlBw4JdwxACfR4Iz
-mcwOYmYZrRgiMBRI7il7SVY=
-=spQd
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
index 07376ef34a15..6d6993136341 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
@@ -1,7 +1,7 @@
 MD5 174ac5ed4f2851fcc866a3bac1e4a6a5 glibc-2.3.4.tar.bz2 13213560
 MD5 7a199cd4965eb5622163756ae64358fe glibc-linuxthreads-2.3.4.tar.bz2 236183
 MD5 1f586b91280665cb8df70bdd7c4583ba glibc-libidn-2.3.4.tar.bz2 100711
-MD5 52058e69010109f8eff19c79c4b667ab glibc-2.3.4-patches-1.5.tar.bz2 32894
+MD5 f6198adee3d4275b4f161a8c4fb86cc6 glibc-2.3.4-patches-1.6.tar.bz2 34018
 MD5 071ec6e3562813a382b75610980bab98 glibc-manpages-2.3.4-r1.tar.bz2 22276
 MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index 97c33b0f7351..123a5de42812 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-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.20050125-r1.ebuild,v 1.22 2005/03/11 00:06:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.23 2005/03/15 20:00:22 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="2.3.4-r1"
 GLIBC_INFOPAGE_VERSION="2.3.4-r1"
 
 # Gentoo patchset
-PATCH_VER="1.5"
+PATCH_VER="1.6"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
@@ -598,8 +598,7 @@ setup_flags() {
 			append-flags "-fcall-used-g6"
 			filter-flags "-mvis"
 
-			# Sparc64 Only support...
-			if is_crosscompile || has_multilib_profile || [ "${PROFILE_ARCH}" = "sparc64" ] ; then
+			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
 				case ${ABI} in
 					default|sparc32)
 						if is-flag "-mcpu=ultrasparc3"; then
@@ -920,7 +919,7 @@ use_multilib() {
 
 # Setup toolchain variables that would be defined in the profiles for these archs.
 crosscompile_setup() {
-	if is_crosscompile; then
+	if is_crosscompile || tc-is-cross-compiler; then
 		# CFLAGS are used by ${CTARGET}-gcc
 		local VAR="CFLAGS_"${CTARGET//-/_}
 		CFLAGS=${!VAR-"-O2"}