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, 26 Jan 2020 00:06:41
Message-Id: 1579997188.ef5d254fef1645d472c71ed393c4d1d55767b792.slyfox@gentoo
1 commit: ef5d254fef1645d472c71ed393c4d1d55767b792
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 26 00:05:06 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 26 00:06:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5d254f
7
8 toolchain.eclass: use ${GCC_CONFIG_VER} in snapshot, don't mangle ${PV}
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 eclass/toolchain.eclass | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
16 index aa70a11c410..a535707f7ec 100644
17 --- a/eclass/toolchain.eclass
18 +++ b/eclass/toolchain.eclass
19 @@ -569,11 +569,7 @@ toolchain_src_prepare() {
20
21 if tc_version_is_at_least 4.1 ; then
22 if [[ -n ${SNAPSHOT} ]] || tc_is_live ; then
23 - # followed by an optional -pre string
24 - # eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999
25 - # If BASE-VER differs from ${PV/_/-} then libraries get installed in
26 - # the wrong directory.
27 - echo ${PV/_/-} > "${S}"/gcc/BASE-VER
28 + echo "${GCC_CONFIG_VER}" > "${S}"/gcc/BASE-VER
29 fi
30 fi