diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-09-08 21:01:38 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-09-08 21:01:38 +0000 |
| commit | 84646c870faa0292c25a12589afc92cbfedf4046 (patch) | |
| tree | f09286e0949d98ab4af7ecf01fffcef9da1c24c2 /eclass | |
| parent | removed hardened-sources-2.4.27-r1 (diff) | |
| download | gentoo-2-84646c870faa0292c25a12589afc92cbfedf4046.tar.gz gentoo-2-84646c870faa0292c25a12589afc92cbfedf4046.tar.bz2 gentoo-2-84646c870faa0292c25a12589afc92cbfedf4046.zip | |
change multilib behavior: instead of using 'use multilib' to enable multilib, 'use nomultilib' to disable it.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 478c4afca4d5..3a42afd96056 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.7 2004/09/07 17:38:38 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.8 2004/09/08 21:01:38 lv Exp $ # # This eclass should contain general toolchain-related functions that are # expected to not change, or change much. @@ -10,7 +10,7 @@ ECLASS=toolchain INHERITED="$INHERITED $ECLASS" DESCRIPTION="Based on the ${ECLASS} eclass" EXPORT_FUNCTIONS src_unpack pkg_setup -IUSE="nls uclibc hardened multilib" +IUSE="nls uclibc hardened nomultilib" if [ "${ETYPE}" == "" ] ; then ETYPE="gcc" @@ -379,7 +379,7 @@ gcc_src_unpack() { einfo "updating configuration to build hardened GCC" make_gcc_hard || die "failed to make gcc hard" fi - if use multilib && use amd64 && [ -z "${SKIP_MULTILIB_HACK}" ] ; then + if use !nomultilib && use amd64 && [ -z "${SKIP_MULTILIB_HACK}" ] ; then disgusting_gcc_multilib_HACK || die "multilib hack failed" fi einfo "patching gcc version: ${BRANCH_UPDATE} (${release_version})" @@ -573,7 +573,7 @@ gcc_do_configure() { fi # multilib support - if use multilib && [ -z "${GCC_TARGET_NO_MULTILIB}" ] ; then + if use !nomultilib && [ -z "${GCC_TARGET_NO_MULTILIB}" ] ; then confgcc="${confgcc} --enable-multilib" else confgcc="${confgcc} --disable-multilib" @@ -733,20 +733,20 @@ gcc_do_make() { create_gcc_multilib_scripts() { - mkdir -p ${D}/${BINPATH} + mkdir -p ${D}/usr/bin/ if has_m32 ; then -cat > ${D}/${BINPATH}/gcc32 <<EOF +cat > ${D}/usr/bin/gcc32 <<EOF #!/bin/sh exec /usr/bin/gcc -m32 "$@" EOF -chmod +x ${D}/${BINPATH}/gcc32 +chmod +x ${D}/usr/bin/gcc32 fi if has_m64 ; then -cat > ${D}/${BINPATH}/gcc64 <<EOF +cat > ${D}/usr/bin/gcc64 <<EOF #!/bin/sh exec /usr/bin/gcc -m64 "$@" EOF -chmod +x ${D}/${BINPATH}/gcc64 +chmod +x ${D}/usr/bin/gcc64 fi } |