Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 03 Feb 2019 23:39:53
Message-Id: 1549237180.f93be58bb19aefa9dd56dac353a4f649d6e58c43.slyfox@gentoo
1 commit: f93be58bb19aefa9dd56dac353a4f649d6e58c43
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 3 23:22:30 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 3 23:39:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93be58b
7
8 toolchain.eclass: drop IUSE_DEF array
9
10 IUSE_DEF is just an IUSE with '+' prepended.
11 IUSE_DEF was not used consistently.
12
13 Use '+' form consistently.
14
15 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
16
17 eclass/toolchain.eclass | 12 ++++--------
18 1 file changed, 4 insertions(+), 8 deletions(-)
19
20 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
21 index 018079ba937..ea1e1f3c5b6 100644
22 --- a/eclass/toolchain.eclass
23 +++ b/eclass/toolchain.eclass
24 @@ -128,12 +128,10 @@ else
25 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
26 fi
27
28 -IUSE="regression-test vanilla"
29 -IUSE_DEF=( nls nptl )
30 +IUSE="regression-test vanilla +nls +nptl"
31
32 if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
33 - IUSE+=" altivec debug"
34 - IUSE_DEF+=( cxx fortran )
35 + IUSE+=" altivec debug +cxx +fortran"
36 [[ -n ${PIE_VER} ]] && IUSE+=" nopie"
37 [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
38 [[ -n ${D_VER} ]] && IUSE+=" d"
39 @@ -144,13 +142,13 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
40 tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
41 tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
42 tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
43 - tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
44 + tc_version_is_at_least 4.2 && IUSE+=" +openmp"
45 tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
46 tc_version_is_at_least 4.7 && IUSE+=" go"
47 # Note: while <=gcc-4.7 also supported graphite, it required forked ppl
48 # versions which we dropped. Since graphite was also experimental in
49 # the older versions, we don't want to bother supporting it. #448024
50 - tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize )
51 + tc_version_is_at_least 4.8 && IUSE+=" graphite +sanitize"
52 tc_version_is_between 4.9 8 && IUSE+=" cilk"
53 tc_version_is_at_least 4.9 && IUSE+=" +vtv"
54 tc_version_is_at_least 5.0 && IUSE+=" jit mpx"
55 @@ -159,8 +157,6 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
56 tc_version_is_at_least 8.0 && IUSE+=" systemtap"
57 fi
58
59 -IUSE+=" ${IUSE_DEF[*]/#/+}"
60 -
61 SLOT="${GCC_CONFIG_VER}"
62
63 #---->> DEPEND <<----