diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-10-28 01:31:25 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-10-28 01:31:25 +0000 |
| commit | 7f146f57b76776efe67808bba8c0a3ec1e5c103f (patch) | |
| tree | 23f011df9961be2a8cf1687d03c0e0f4852f46cd /sys-libs/glibc/glibc-2.3.5-r3.ebuild | |
| parent | Added CONFIG_CHECK for I2C_ALGOBIT per Bug# 107427, thanks to betelgeuse! (diff) | |
| download | gentoo-2-7f146f57b76776efe67808bba8c0a3ec1e5c103f.tar.gz gentoo-2-7f146f57b76776efe67808bba8c0a3ec1e5c103f.tar.bz2 gentoo-2-7f146f57b76776efe67808bba8c0a3ec1e5c103f.zip | |
Cleaned up setup_env, and fixed the usage of CFLAGS_<CTARGET>.
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'sys-libs/glibc/glibc-2.3.5-r3.ebuild')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r3.ebuild | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild index 5158c48e3f11..0ecc36e7f868 100644 --- 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 } |