diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-03-29 06:15:31 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-29 06:15:31 +0000 |
| commit | 793d2e65fd4b1a2abaa06e4372afb83b10de5dae (patch) | |
| tree | a5ca2475792858d691d7a1f6a96af621e171079f /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-793d2e65fd4b1a2abaa06e4372afb83b10de5dae.tar.gz gentoo-2-793d2e65fd4b1a2abaa06e4372afb83b10de5dae.tar.bz2 gentoo-2-793d2e65fd4b1a2abaa06e4372afb83b10de5dae.zip | |
do not depend on graphite packages when USE=graphite is unavailable #544818 by Michał Górny
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 9a24b854f321..8e8f44117314 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.657 2015/03/17 06:34:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.658 2015/03/29 06:15:31 vapier Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -181,14 +181,16 @@ fi tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1" -if tc_version_is_at_least 5.0 ; then - RDEPEND+=" graphite? ( >=dev-libs/isl-0.12 )" -elif tc_version_is_at_least 4.8 ; then - RDEPEND+=" - graphite? ( - >=dev-libs/cloog-0.18.0 - >=dev-libs/isl-0.11.1 - )" +if in_iuse graphite ; then + if tc_version_is_at_least 5.0 ; then + RDEPEND+=" graphite? ( >=dev-libs/isl-0.12 )" + elif tc_version_is_at_least 4.8 ; then + RDEPEND+=" + graphite? ( + >=dev-libs/cloog-0.18.0 + >=dev-libs/isl-0.11.1 + )" + fi fi DEPEND="${RDEPEND} |