Fixed a bug setting CTARGET_OPT incorrectly for some crosscompilers.

Package-Manager: portage-2.0.53_rc3

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d3189743226e41a789f35958e5da76ee66e055ba..c17dd2066c7e8f0945b3c5c744d0359b6915c359 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -129,15 +129,15 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
 MD5 cdbe2c23324cb303ee28f52927bd64f2 glibc-2.3.4.20050125-r1.ebuild 39566
 MD5 f9ecdb0b89b5b8a0667a86d40dfbc9c9 glibc-2.3.5-r1.ebuild 40292
-MD5 c1978cbb0ead3b4bd501851193c396ed glibc-2.3.5-r2.ebuild 38405
+MD5 ca573372025b7364c3817232063c2a1f glibc-2.3.5-r2.ebuild 38421
 MD5 65203448f3153faa1943b035e7c18e5f glibc-2.3.5.20050421.ebuild 40178
-MD5 e83d18b523ec3337eb395e1f2dff5aa1 glibc-2.3.5.20050722.ebuild 39163
+MD5 66a7dcd66b72dce0661ca062c32e54ab glibc-2.3.5.20050722.ebuild 39177
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDReebOpjtAl+gMRURAoLtAJ9qPdxxWWGTw2gxJFQY7voobX29PwCgzzTP
-jEC9JynSfOty5YT8PgCn7iY=
-=7AdF
+iD8DBQFDRe7nOpjtAl+gMRURAtgjAJ9SlZYSSDVKx/IraJKpD5b00Hv/wACfc1cU
+K5jAPWFXJRtJgKGmYRw0HsI=
+=3qM+
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
index 4fa01619e774fcb8a80c885e58ef98aa62e87325..d535cae48f261382299906f2ad1e7ee2982adc0e 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-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.5-r2.ebuild,v 1.4 2005/10/07 03:12:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.5 2005/10/07 03:43:00 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -626,8 +626,10 @@ setup_flags() {
        filter-flags -m32 -m64 -mabi=*
 
        unset CBUILD_OPT CTARGET_OPT
-       has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
-       [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+       if has_multilib_profile ; then
+               CTARGET_OPT=$(get_abi_CTARGET)
+               [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+       fi
 
        case $(tc-arch) in
                amd64)

diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index 4c2fd23403fda747e8c79d6c0d3dac2268166f79..c83f1cb57a7f5ddfa1c443136c3cf80aee7f00ae 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.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.5.20050722.ebuild,v 1.20 2005/10/07 03:12:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.21 2005/10/07 03:43:00 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -629,8 +629,10 @@ setup_flags() {
        filter-flags -m32 -m64 -mabi=*
 
        unset CBUILD_OPT CTARGET_OPT
-       has_multilib_profile && CTARGET_OPT=$(get_abi_CTARGET)
-       [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+       if has_multilib_profile ; then
+               CTARGET_OPT=$(get_abi_CTARGET)
+               [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+       fi
 
        case $(tc-arch) in
                ppc)