| 1 |
commit: ae32671f6e3de1fc3f459e258495cbc4e01820ba |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 1 11:23:05 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 11:29:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae32671f |
| 7 |
|
| 8 |
toolchain.eclass: drop USE=graphite support for <gcc-6.5 |
| 9 |
|
| 10 |
Reported-by: Rolf Eike Beer |
| 11 |
Closes: https://bugs.gentoo.org/701270 |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/toolchain.eclass | 36 +++++++++++++++++------------------- |
| 15 |
1 file changed, 17 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 18 |
index 5ec86ca126c..8929a1869fc 100644 |
| 19 |
--- a/eclass/toolchain.eclass |
| 20 |
+++ b/eclass/toolchain.eclass |
| 21 |
@@ -164,11 +164,16 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then |
| 22 |
tc_version_is_at_least 4.2 && IUSE+=" +openmp" |
| 23 |
tc_version_is_at_least 4.3 && IUSE+=" fixed-point" |
| 24 |
tc_version_is_at_least 4.7 && IUSE+=" go" |
| 25 |
- # Note: while <=gcc-4.7 also supported graphite, it required forked ppl |
| 26 |
- # versions which we dropped. Since graphite was also experimental in |
| 27 |
- # the older versions, we don't want to bother supporting it. #448024 |
| 28 |
tc_version_is_at_least 4.8 && |
| 29 |
- IUSE+=" graphite +sanitize" TC_FEATURES+=(graphite) |
| 30 |
+ IUSE+=" +sanitize" |
| 31 |
+ # Note: |
| 32 |
+ # <gcc-4.8 supported graphite, it required forked ppl |
| 33 |
+ # versions which we dropped. Since graphite was also experimental in |
| 34 |
+ # the older versions, we don't want to bother supporting it. #448024 |
| 35 |
+ # <gcc-5 supported graphite, it required cloog |
| 36 |
+ # <gcc-6.5 supported graphite, it required old incompatible isl |
| 37 |
+ tc_version_is_at_least 6.5 && |
| 38 |
+ IUSE+=" graphite" TC_FEATURES+=(graphite) |
| 39 |
tc_version_is_between 4.9 8 && IUSE+=" cilk" |
| 40 |
tc_version_is_at_least 4.9 && IUSE+=" +vtv" |
| 41 |
tc_version_is_at_least 5.0 && IUSE+=" jit" |
| 42 |
@@ -214,15 +219,7 @@ if tc_has_feature objc-gc ; then |
| 43 |
fi |
| 44 |
|
| 45 |
if tc_has_feature graphite ; then |
| 46 |
- if tc_version_is_at_least 5.0 ; then |
| 47 |
- RDEPEND+=" graphite? ( >=dev-libs/isl-0.14:0= )" |
| 48 |
- elif tc_version_is_at_least 4.8 ; then |
| 49 |
- RDEPEND+=" |
| 50 |
- graphite? ( |
| 51 |
- >=dev-libs/cloog-0.18.0:0= |
| 52 |
- >=dev-libs/isl-0.11.1:0= |
| 53 |
- )" |
| 54 |
- fi |
| 55 |
+ RDEPEND+=" graphite? ( >=dev-libs/isl-0.14:0= )" |
| 56 |
fi |
| 57 |
|
| 58 |
DEPEND="${RDEPEND} |
| 59 |
@@ -1322,14 +1319,15 @@ toolchain_src_configure() { |
| 60 |
confgcc+=( --disable-lto ) |
| 61 |
fi |
| 62 |
|
| 63 |
- # graphite was added in 4.4 but we only support it in 4.8+ due to external |
| 64 |
- # library issues. #448024 |
| 65 |
- if tc_version_is_at_least 5.0 && in_iuse graphite ; then |
| 66 |
+ # graphite was added in 4.4 but we only support it in 6.5+ due to external |
| 67 |
+ # library issues. #448024, #701270 |
| 68 |
+ if tc_version_is_at_least 6.5 && in_iuse graphite ; then |
| 69 |
confgcc+=( $(use_with graphite isl) ) |
| 70 |
use graphite && confgcc+=( --disable-isl-version-check ) |
| 71 |
- elif tc_version_is_at_least 4.8 && in_iuse graphite ; then |
| 72 |
- confgcc+=( $(use_with graphite cloog) ) |
| 73 |
- use graphite && confgcc+=( --disable-isl-version-check ) |
| 74 |
+ elif tc_version_is_at_least 5.0 ; then |
| 75 |
+ confgcc+=( --without-isl ) |
| 76 |
+ elif tc_version_is_at_least 4.8 ; then |
| 77 |
+ confgcc+=( --without-cloog ) |
| 78 |
elif tc_version_is_at_least 4.4 ; then |
| 79 |
confgcc+=( --without-{cloog,ppl} ) |
| 80 |
fi |
Archives