diff options
Diffstat (limited to 'sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild | 80 |
1 files changed, 32 insertions, 48 deletions
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild index de9e0c28055f..bf8ff383b759 100644 --- a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20041102-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.4.20041102-r2.ebuild,v 1.2 2005/07/26 22:20:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.3 2005/09/16 02:03:57 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -245,8 +245,15 @@ toolchain-glibc_src_unpack() { toolchain-glibc_src_compile() { # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs + local MAKEFLAGS="" has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" + echo + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do + einfo " $(printf '%15s' ${v}:) ${!v}" + done + echo + # -fomit-frame-pointer gets stripped in setup_flags, so we do this # now to cache the value want_omitfp @@ -616,7 +623,7 @@ alt_prefix() { alt_libdir() { if is_crosscompile ; then - echo /usr/${CTARGET}/lib + echo /usr/${CTARGET}/$(get_libdir) else echo /$(get_libdir) fi @@ -624,7 +631,7 @@ alt_libdir() { alt_usrlibdir() { if is_crosscompile ; then - echo /usr/${CTARGET}/lib + echo /usr/${CTARGET}/$(get_libdir) else echo /usr/$(get_libdir) fi @@ -994,33 +1001,10 @@ fix_lib64_symlinks() { } use_multilib() { - case $(tc-arch) in - sparc) - case ${CHOST} in - sparc64*) - is_crosscompile || has_multilib_profile || use multilib - ;; - *) - false - ;; - esac - ;; - mips) - case ${CHOST} in - mips64*) - is_crosscompile || has_multilib_profile || use multilib - ;; - *) - false - ;; - esac - ;; - amd64|ppc64) - is_crosscompile || has_multilib_profile || use multilib - ;; - *) - false - ;; + case ${CTARGET} in + sparc64*|mips64*|amd64|ppc64) + is_crosscompile || has_multilib_profile || use multilib ;; + *) false ;; esac } @@ -1033,13 +1017,13 @@ crosscompile_setup() { case ${CTARGET} in x86_64*) - export CFLAGS_x86="${CFLAGS_x86--m32}" - export CHOST_x86="i686-pc-linux-gnu" + export CFLAGS_x86=${CFLAGS_x86--m32} + export CHOST_x86=${CTARGET/x86_64/i686} export CDEFINE_x86="__i386__" export LIBDIR_x86="lib" - export CFLAGS_amd64="${CFLAGS_amd64--m64}" - export CHOST_amd64="x86_64-pc-linux-gnu" + export CFLAGS_amd64=${CFLAGS_amd64--m64} + export CHOST_amd64=${CTARGET} export CDEFINE_amd64="__x86_64__" export LIBDIR_amd64="lib64" @@ -1047,18 +1031,18 @@ crosscompile_setup() { export DEFAULT_ABI="amd64" ;; mips64*) - export CFLAGS_o32="${CFLAGS_o32--mabi=32}" - export CHOST_o32="mips-unknown-linux-gnu" + export CFLAGS_o32=${CFLAGS_o32--mabi=32} + export CHOST_o32=${CTARGET/mips64/mips} export CDEFINE_o32="_ABIO32" export LIBDIR_o32="lib" - export CFLAGS_n32="${CFLAGS_n32--mabi=n32}" - export CHOST_n32="mips64-unknown-linux-gnu" + export CFLAGS_n32=${CFLAGS_n32--mabi=n32} + export CHOST_n32=${CTARGET} export CDEFINE_n32="_ABIN32" export LIBDIR_n32="lib32" - export CFLAGS_n64="${CFLAGS_n64--mabi=64}" - export CHOST_n64="mips64-unknown-linux-gnu" + export CFLAGS_n64=${CFLAGS_n64--mabi=64} + export CHOST_n64=${CTARGET} export CDEFINE_n64="_ABI64" export LIBDIR_n64="lib64" @@ -1066,13 +1050,13 @@ crosscompile_setup() { export DEFAULT_ABI="n32" ;; powerpc64*) - export CFLAGS_ppc="${CFLAGS_ppc--m32}" - export CHOST_ppc="powerpc-unknown-linux-gnu" + export CFLAGS_ppc=${CFLAGS_ppc--m32} + export CHOST_ppc=${CTARGET/powerpc64/powerpc} export CDEFINE_ppc="!__powerpc64__" export LIBDIR_ppc="lib" - export CFLAGS_ppc64="${CFLAGS_ppc64--m64}" - export CHOST_ppc64="powerpc64-unknown-linux-gnu" + export CFLAGS_ppc64=${CFLAGS_ppc64--m64} + export CHOST_ppc64=${CTARGET} export CDEFINE_ppc64="__powerpc64__" export LIBDIR_ppc64="lib64" @@ -1080,13 +1064,13 @@ crosscompile_setup() { export DEFAULT_ABI="ppc64" ;; sparc64*) - export CFLAGS_sparc32="${CFLAGS_sparc--m32}" - export CHOST_sparc32="sparc-unknown-linux-gnu" + export CFLAGS_sparc32=${CFLAGS_sparc--m32} + export CHOST_sparc32=${CTARGET/sparc64/sparc} export CDEFINE_sparc32="!__arch64__" export LIBDIR_sparc32="lib" - export CFLAGS_sparc64="${CFLAGS_sparc64--m64}" - export CHOST_sparc64="sparc64-unknown-linux-gnu" + export CFLAGS_sparc64=${CFLAGS_sparc64--m64} + export CHOST_sparc64=${CTARGET} export CDEFINE_sparc64="__arch64__" export LIBDIR_sparc64="lib64" |