diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2012-02-20 07:18:47 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2012-02-20 07:18:47 +0000 |
| commit | 77f6e9b906395fd6547c4faa3e05cb7f780ca6a8 (patch) | |
| tree | 22d6569cb4f7247547be43e4b1ee7d485c6a3b89 /eclass | |
| parent | Version bump. Skip failing test instead of all tests. Add ruby19. (diff) | |
| download | gentoo-2-77f6e9b906395fd6547c4faa3e05cb7f780ca6a8.tar.gz gentoo-2-77f6e9b906395fd6547c4faa3e05cb7f780ca6a8.tar.bz2 gentoo-2-77f6e9b906395fd6547c4faa3e05cb7f780ca6a8.zip | |
Require dev-libs/ppl-0.11 now that it's stable (bug #396569). Drop cloog-ppl include path workaround as we've required 0.15.0 for a while now.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 95e2d023b982..54ce59471ee4 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.137 2012/02/20 02:54:21 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.138 2012/02/20 07:18:47 dirtyepic Exp $ + + 20 Feb 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + Require dev-libs/ppl-0.11 now that it's stable (bug #396569). Drop cloog-ppl + include path workaround as we've required 0.15.0 for a while now. 20 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> autotools.eclass: Remove my WANT_AUTOMAKE=none overloading in eautomake and instead introduce diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index e63b9192b560..75e89dd62ca1 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.516 2012/02/12 14:17:33 zorry Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.517 2012/02/20 07:18:47 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -138,7 +138,7 @@ if in_iuse graphite ; then RDEPEND+=" graphite? ( >=dev-libs/cloog-ppl-0.15.10 - >=dev-libs/ppl-0.10 + >=dev-libs/ppl-0.11 )" fi @@ -1070,12 +1070,7 @@ gcc_do_configure() { confgcc+=" $(use_with graphite cloog)" if use graphite; then confgcc+=" --disable-ppl-version-check" - # this will be removed when cloog-ppl-0.15.10 goes stable - if has_version '>=dev-libs/cloog-ppl-0.15.10'; then - confgcc+=" --with-cloog-include=/usr/include/cloog-ppl" - else - confgcc+=" --with-cloog-include=/usr/include/cloog" - fi + confgcc+=" --with-cloog-include=/usr/include/cloog-ppl" fi fi |