diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2008-08-11 22:40:31 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2008-08-11 22:40:31 +0000 |
| commit | b2a99762f23c14ba00719a929775b372c756e1d3 (patch) | |
| tree | 21eb9fbdebf26909bcb8633ceb28ac71e5c420d3 /eclass/toolchain.eclass | |
| parent | Fix split qt4 deps wrt bug 217161. (diff) | |
| download | gentoo-2-b2a99762f23c14ba00719a929775b372c756e1d3.tar.gz gentoo-2-b2a99762f23c14ba00719a929775b372c756e1d3.tar.bz2 gentoo-2-b2a99762f23c14ba00719a929775b372c756e1d3.zip | |
Fix SRC_URI so it doesn't have gcj dragged in unless its in IUSE
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 01479705c54f..4f17db9e495f 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.359 2008/08/03 01:43:30 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.360 2008/08/11 22:40:31 halcy0n Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -340,10 +340,13 @@ get_gcc_src_uri() { [[ -n ${D_VER} ]] && \ GCC_SRC_URI="${GCC_SRC_URI} d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )" - # >= gcc-4.3 no longer bundles ecj.jar - tc_version_is_at_least "4.3" && \ - GCC_SRC_URI="${GCC_SRC_URI} - gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )" + # >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain + # conditions + if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then + tc_version_is_at_least "4.3" && \ + GCC_SRC_URI="${GCC_SRC_URI} + gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )" + fi echo "${GCC_SRC_URI}" } @@ -1071,7 +1074,7 @@ gcc_src_unpack() { cp -pPR "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h fi - # >= gcc-4.3 doesn't bundle ecj.jar anymore, so copy it + # >= gcc-4.3 doesn't bundle ecj.jar, so copy it if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] && use gcj ; then cp -pPR "${DISTDIR}/ecj-${GCC_BRANCH_VER}.jar" "${S}/ecj.jar" || die |