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, 27 Oct 2019 20:16:56
Message-Id: 1572207408.d2f7c8c1e90dd39818c8a810c57c9b15f96ffbe0.slyfox@gentoo
1 commit: d2f7c8c1e90dd39818c8a810c57c9b15f96ffbe0
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 27 20:15:41 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 27 20:16:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f7c8c1
7
8 toolchain.eclass: set SLOT=${GCCMAJOR} for gcc-10*
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 eclass/toolchain.eclass | 8 +++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
16 index 7e88900737a..d2bfa6ab2f1 100644
17 --- a/eclass/toolchain.eclass
18 +++ b/eclass/toolchain.eclass
19 @@ -186,7 +186,13 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
20 tc_version_is_at_least 9.1 && IUSE+=" lto"
21 fi
22
23 -SLOT="${GCC_CONFIG_VER}"
24 +if tc_version_is_at_least 10; then
25 + # Note: currently we pull in prereleases, snapshots and
26 + # git versions into the same SLOT.
27 + SLOT="${GCCMAJOR}"
28 +else
29 + SLOT="${GCC_CONFIG_VER}"
30 +fi
31
32 #---->> DEPEND <<----