Crosscompile for multilib targets cleanup.

Package-Manager: portage-2.0.51.19

2 files changed, 76 insertions, 77 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index bb49c5056a29..23ddbc7668fd 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -11,7 +11,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 84c9a8432749bc1b854021d8d05f1ed9 glibc-2.3.4.20050125-r1.ebuild 37648
+MD5 ee87edeed7c071b86a057fbe087d2ab4 glibc-2.3.4.20050125-r1.ebuild 37412
 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
@@ -145,7 +145,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCLPudArHZZzCEUG0RAkRCAJ0UjDlrvBPDMNACuZvohVTvmS0dYQCfXNyt
-DmZ4NfHCTCaALE3aGAvoDI4=
-=Xy6/
+iD8DBQFCLiy3ArHZZzCEUG0RAiElAJ9px2D6796juIKZPcAu1gSCUSp2vQCggMPg
+i0n2+e0CkmeRHJrXaAczAIs=
+=QzLo
 -----END PGP SIGNATURE-----
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 1643dc5b5dbd..4e52da75609d 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.18 2005/03/08 01:10:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.19 2005/03/08 22:52:10 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -600,7 +600,7 @@ setup_flags() {
 			filter-flags "-mvis"
 
 			# Sparc64 Only support...
-			if has_multilib_profile || [ "${PROFILE_ARCH}" = "sparc64" ] ; then
+			if is_crosscompile || has_multilib_profile || [ "${PROFILE_ARCH}" = "sparc64" ] ; then
 				case ${ABI} in
 					default|sparc32)
 						if is-flag "-mcpu=ultrasparc3"; then
@@ -928,77 +928,76 @@ crosscompile_setup() {
 			CFLAGS="${VAL}"
 		fi
 
-		if use_multilib; then
-			[[ -z ${MULTILIB_CROSSCOMPILE} ]] && die "Crosscompiling for ${CTARGET} is nut supported by the glibc ebuild yet.  Please contact eradicator if you want to help testing/development."
-			case $(tc-arch) in
-				amd64)
-					export CFLAGS_x86="${CFLAGS_x86--m32}"
-					export CHOST_x86="i686-pc-linux-gnu"
-					export CDEFINE_x86="__i386__"
-					export LIBDIR_x86="lib"
-
-					export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-					export CHOST_amd64="x86_64-pc-linux-gnu"
-					export CDEFINE_amd64="__x86_64__"
-					export LIBDIR_amd64="lib64"
-
-					export MULTILIB_ABIS="x86 amd64"
-					export DEFAULT_ABI="amd64"
-				;;
-				mips)
-					export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-					export CHOST_o32="mips-unknown-linux-gnu"
-					export CDEFINE_o32="_ABIO32"
-					export LIBDIR_o32="lib"
-
-					export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-					export CHOST_n32="mips64-unknown-linux-gnu"
-					export CDEFINE_n32="_ABIN32"
-					export LIBDIR_n32="lib32"
-
-					export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-					export CHOST_n64="mips64-unknown-linux-gnu"
-					export CDEFINE_n64="_ABI64"
-					export LIBDIR_n64="lib64"
-
-					export MULTILIB_ABIS="n64 n32 o32"
-					export DEFAULT_ABI="o32"
-				;;
-				ppc64)
-					export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-					export CHOST_ppc="powerpc-unknown-linux-gnu"
-					export CDEFINE_ppc=""
-					export LIBDIR_ppc="lib"
-
-					export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-					export CHOST_ppc64="powerpc64-unknown-linux-gnu"
-					export CDEFINE_ppc64=""
-					export LIBDIR_ppc64="lib64"
-
-					export MULTILIB_ABIS="ppc ppc64"
-					export DEFAULT_ABI="ppc64"
-
-					die "ppc64 crosscompile not yet supported.  Bug a ppc64 dev to fill in the CDEFINE values in the glibc ebuild."
-				;;
-				sparc)
-					export CFLAGS_sparc="${CFLAGS_sparc--m32}"
-					export CHOST_sparc="sparc-unknown-linux-gnu"
-					export CDEFINE_sparc="!__arch64__"
-					export LIBDIR_sparc="lib"
-
-					export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-					export CHOST_sparc64="sparc64-unknown-linux-gnu"
-					export CDEFINE_sparc64="__arch64__"
-					export LIBDIR_sparc64="lib64"
-
-					export MULTILIB_ABIS="sparc64 sparc"
-					export DEFAULT_ABI="sparc"
-				;;
-			esac
-		else
-			export MULTILIB_ABIS="default"
-			export DEFAULT_ABI="default"
-		fi
+		case $(tc-arch) in
+			amd64)
+				export CFLAGS_x86="${CFLAGS_x86--m32}"
+				export CHOST_x86="i686-pc-linux-gnu"
+				export CDEFINE_x86="__i386__"
+				export LIBDIR_x86="lib"
+
+				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
+				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CDEFINE_amd64="__x86_64__"
+				export LIBDIR_amd64="lib64"
+
+				export MULTILIB_ABIS="amd64"
+				export DEFAULT_ABI="amd64"
+			;;
+			mips)
+				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
+				export CHOST_o32="mips-unknown-linux-gnu"
+				export CDEFINE_o32="_ABIO32"
+				export LIBDIR_o32="lib"
+
+				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
+				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CDEFINE_n32="_ABIN32"
+				export LIBDIR_n32="lib32"
+
+				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
+				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CDEFINE_n64="_ABI64"
+				export LIBDIR_n64="lib64"
+
+				export MULTILIB_ABIS="n64 n32"
+				export DEFAULT_ABI="n32"
+			;;
+			ppc64)
+				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
+				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CDEFINE_ppc=""
+				export LIBDIR_ppc="lib"
+
+				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
+				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CDEFINE_ppc64=""
+				export LIBDIR_ppc64="lib64"
+
+				export MULTILIB_ABIS="ppc64"
+				export DEFAULT_ABI="ppc64"
+
+				die "ppc64 crosscompile not yet supported.  Bug a ppc64 dev to fill in the CDEFINE values in the glibc ebuild."
+			;;
+			sparc)
+				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
+				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CDEFINE_sparc32="!__arch64__"
+				export LIBDIR_sparc32="lib"
+
+				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
+				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CDEFINE_sparc64="__arch64__"
+				export LIBDIR_sparc64="lib64"
+
+				export MULTILIB_ABIS="sparc64"
+				export DEFAULT_ABI="sparc64"
+			;;
+			*)
+				export MULTILIB_ABIS="default"
+				export DEFAULT_ABI="default"
+		esac
+
+		ABI=${DEFAULT_ABI}
 	fi
 }