diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-11-21 21:26:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-11-21 21:26:22 +0000 |
| commit | 5916a64c0925f200b2d7b1f11b5d05f3cff1d4d2 (patch) | |
| tree | f489d74420429abe0993290865a7eee388c32e9f /eclass | |
| parent | make sure to explicitly pass --disable-libgomp when using a package that lack... (diff) | |
| download | historical-5916a64c0925f200b2d7b1f11b5d05f3cff1d4d2.tar.gz historical-5916a64c0925f200b2d7b1f11b5d05f3cff1d4d2.tar.bz2 historical-5916a64c0925f200b2d7b1f11b5d05f3cff1d4d2.zip | |
convert IUSE appending to the += operator, and pull out IUSE=vanilla for all gcc packages
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a7622867cebb..5b986548e541 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.442 2010/11/21 21:25:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.443 2010/11/21 21:26:22 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -139,31 +139,35 @@ if [[ ${ETYPE} == "gcc-library" ]] ; then else IUSE="multislot nptl test" + if tc_version_is_at_least 3 ; then + IUSE+=" vanilla" + fi + if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then - IUSE="${IUSE} altivec build fortran nls nocxx" - [[ -n ${PIE_VER} ]] && IUSE="${IUSE} nopie" - [[ -n ${PP_VER} ]] && IUSE="${IUSE} nossp" - [[ -n ${SPECS_VER} ]] && IUSE="${IUSE} nossp" - [[ -n ${HTB_VER} ]] && IUSE="${IUSE} boundschecking" - [[ -n ${D_VER} ]] && IUSE="${IUSE} d" + IUSE+=" altivec build fortran nls nocxx" + [[ -n ${PIE_VER} ]] && IUSE+=" nopie" + [[ -n ${PP_VER} ]] && IUSE+=" nossp" + [[ -n ${SPECS_VER} ]] && IUSE+=" nossp" + [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" + [[ -n ${D_VER} ]] && IUSE+=" d" if tc_version_is_at_least 3 ; then - IUSE="${IUSE} bootstrap doc gcj gtk hardened libffi multilib objc vanilla" + IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc" # gcc-{nios2,bfin} don't accept these if [[ ${PN} == "gcc" ]] ; then - IUSE="${IUSE} n32 n64" + IUSE+=" n32 n64" fi - tc_version_is_at_least "4.0" && IUSE="${IUSE} objc-gc mudflap" - tc_version_is_at_least "4.1" && IUSE="${IUSE} objc++" - tc_version_is_at_least "4.2" && IUSE="${IUSE} openmp" - tc_version_is_at_least "4.3" && IUSE="${IUSE} fixed-point" + tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap" + tc_version_is_at_least "4.1" && IUSE+=" objc++" + tc_version_is_at_least "4.2" && IUSE+=" openmp" + tc_version_is_at_least "4.3" && IUSE+=" fixed-point" if tc_version_is_at_least "4.4" ; then - IUSE="${IUSE} graphite" - [[ -n ${SPECS_VER} ]] && IUSE="${IUSE} nossp" + IUSE+=" graphite" + [[ -n ${SPECS_VER} ]] && IUSE+=" nossp" fi - tc_version_is_at_least "4.5" && IUSE="${IUSE} lto" + tc_version_is_at_least "4.5" && IUSE+=" lto" fi fi |