diff options
Diffstat (limited to 'sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild | 145 |
1 files changed, 72 insertions, 73 deletions
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 } |