diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-10-14 02:17:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-10-14 02:17:21 +0000 |
| commit | 244bd655424d5535c5175aeed5b0dcc9ac157c51 (patch) | |
| tree | b7ff349ac80a17687506cfbc1bf644e2d2dc5746 /sys-libs | |
| parent | Mark 4.0.1 stable on alpha (diff) | |
| download | gentoo-2-244bd655424d5535c5175aeed5b0dcc9ac157c51.tar.gz gentoo-2-244bd655424d5535c5175aeed5b0dcc9ac157c51.tar.bz2 gentoo-2-244bd655424d5535c5175aeed5b0dcc9ac157c51.zip | |
Filter CFLAGS and force default ABI when cross-compiling.
(Portage version: 2.0.53_rc5)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r2.ebuild | 36 |
2 files changed, 29 insertions, 12 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 59f94e1e6889..80bc0c2a9adb 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # 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.398 2005/10/11 23:55:21 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.399 2005/10/14 02:17:21 vapier Exp $ + + 14 Oct 2005; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r2.ebuild: + Filter CFLAGS and force default ABI when cross-compiling. 11 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5-r2.ebuild: diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild index cd680221811e..e6fe02890b2b 100644 --- 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.14 2005/10/12 22:33:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.15 2005/10/14 02:17:21 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -602,6 +602,11 @@ alt_usrlibdir() { } setup_flags() { + # Make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi + # Store our CFLAGS because it's changed depending on which CTARGET # we are building when pulling glibc on a multilib profile CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} @@ -987,7 +992,7 @@ setup_env() { if is_crosscompile || tc-is-cross-compiler ; then # We only install for this CTARGET on crosscompilers - MULTILIB_ABIS=${MULTILIB_ABIS:-DEFAULT_ABI} + MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} # We need to export CFLAGS with abi information in them because # glibc's configure script checks CFLAGS for some targets (like mips) @@ -1147,16 +1152,25 @@ src_unpack() { src_compile() { setup_env - if [[ -z ${OABI} ]] && has_multilib_profile ; then - OABI=${ABI} - einfo "Building multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI + if [[ -z ${OABI} ]] ; then + if has_multilib_profile ; then + OABI=${ABI} + einfo "Building multilib glibc for ABIs: $(get_install_abis)" + for ABI in $(get_install_abis) ; do + export ABI + src_compile + done + ABI=${OABI} + unset OABI + return 0 + elif is_crosscompile || tc-is-cross-compiler ; then + OABI=${ABI} + export ABI=${DEFAULT_ABI} src_compile - done - ABI=${OABI} - unset OABI - return 0 + ABI=${OABI} + unset OABI + return 0 + fi fi toolchain-glibc_src_compile |