Cleaned up setup_env, and fixed the usage of CFLAGS_<CTARGET>.

Package-Manager: portage-2.0.53_rc6

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 1ca3b12a30523d0eb5d06bd49197f2958313b45c..6091d8c33360511b44cad534461400bbdd4ac36c 100644 (file)
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,10 +1,14 @@
 # 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.404 2005/10/27 20:45:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.405 2005/10/28 01:31:25 eradicator Exp $
 
   27 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> glibc-2.3.5-r3.ebuild:
   Added to ~ppc.
 
+  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r3.ebuild:
+  Cleaned up setup_env, and fixed the usage of CFLAGS_<CTARGET>.
+
 *glibc-2.3.5-r3 (27 Oct 2005)
 
   27 Oct 2005; Mike Frysinger <vapier@gentoo.org> +glibc-2.3.5-r3.ebuild:

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 17d4b7242f3ffc1d4e79bd5bfc28068032e6f497..9a63e43114a5e356ce8e8b318946c19279cf3402 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 de8a4c2710606af95a6610c61625454c ChangeLog 85781
+MD5 c7c7d9d87aefebc5fbe815a157b92d08 ChangeLog 85933
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
@@ -131,7 +131,7 @@ MD5 5eeb3fe6a71b64a081e642ffb08c0cbe glibc-2.3.4.20041102-r2.ebuild 41281
 MD5 9bc40ac03e72b63652f67be3dcecc184 glibc-2.3.4.20050125-r1.ebuild 39474
 MD5 2e7e5fc05139d73ced40d2cb52816b44 glibc-2.3.5-r1.ebuild 40533
 MD5 b1cba6eb03515d24e61e321c457670fd glibc-2.3.5-r2.ebuild 38859
-MD5 7533325ef6585ff9c095b48c0cc8c4c3 glibc-2.3.5-r3.ebuild 38920
+MD5 e503f5bea5e06ea816f845ce0aa15f4c glibc-2.3.5-r3.ebuild 38991
 MD5 1cb57f1757c26c0e0286cb0ef6c36171 glibc-2.3.5.20050421.ebuild 40152
 MD5 48b60115273ba9fa755a6ef94fe8c3b6 glibc-2.3.5.20050722.ebuild 39299
 MD5 9c15c32a0bbef91769c4fd0c0d7a66c3 glibc-2.3.5.ebuild 40143
@@ -139,7 +139,7 @@ MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDYXqWgIKl8Uu19MoRAlyEAJ45vlsSThBEI+JNRA5GwXpPx5s+gACeKP98
-ZCc10m4BS3fOEJCv16HCgBs=
-=Jtlx
+iD8DBQFDYX+BOpjtAl+gMRURAtK9AJ9JG9aVXDYUrkKejuGFVU19BlXX8gCdGlX1
+vxt4M4eeFVR7TCZaLESlpBU=
+=Qg1b
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild
index 5158c48e3f115cbaf63966312447bc676fb758e9..0ecc36e7f868f8dddbb239c1bc5e5977f4877f86 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r3.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-r3.ebuild,v 1.3 2005/10/28 01:10:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.4 2005/10/28 01:31:25 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -987,22 +987,25 @@ setup_env() {
                else
                        case ${CTARGET} in
                        mips64*) MULTILIB_ABIS=${MULTILIB_ABIS/o32} ;;
+                       *)       MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} ;;
                        esac
                fi
-       fi
 
-       export ABI=${ABI:-${DEFAULT_ABI:-default}}
+               # If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+               # and fall back on CFLAGS.
+               local VAR=CFLAGS_${CTARGET//[-.]/_}
+               CFLAGS=${!VAR-${CFLAGS}}
+       fi
 
        setup_flags
 
-       if is_crosscompile || tc-is-cross-compiler ; then
-               # We only install for this CTARGET on crosscompilers
-               MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+       export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
+       if is_crosscompile || tc-is-cross-compiler ; then
+               local VAR=CFLAGS_${ABI}
                # We need to export CFLAGS with abi information in them because
                # glibc's configure script checks CFLAGS for some targets (like mips)
-               local VAR1=CFLAGS_${CTARGET//[-.]/_} VAR2=CFLAGS_${ABI}
-               export CFLAGS="${CFLAGS} ${!VAR1-${!VAR2--O2 -pipe}}"
+               export CFLAGS="${!VAR} ${CFLAGS}"
        fi
 }