| 1 |
commit: 9cfef505387b4bfce445217fd96fcd67a3f3b57d |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 3 00:55:01 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 3 00:55:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfef505 |
| 7 |
|
| 8 |
toolchain.eclass: change SLOT to major version for gcc-5+ #555164 |
| 9 |
|
| 10 |
eclass/toolchain.eclass | 5 ++++- |
| 11 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 14 |
index b81dbb0..d0bc068 100644 |
| 15 |
--- a/eclass/toolchain.eclass |
| 16 |
+++ b/eclass/toolchain.eclass |
| 17 |
@@ -160,8 +160,11 @@ IUSE+=" ${IUSE_DEF[*]/#/+}" |
| 18 |
# Support upgrade paths here or people get pissed |
| 19 |
if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then |
| 20 |
SLOT="${GCC_CONFIG_VER}" |
| 21 |
-else |
| 22 |
+elif ! tc_version_is_at_least 5.0 ; then |
| 23 |
SLOT="${GCC_BRANCH_VER}" |
| 24 |
+else |
| 25 |
+ # Upstream changed versioning w/gcc-5+, so SLOT matches major only. #555164 |
| 26 |
+ SLOT="${GCCMAJOR}" |
| 27 |
fi |
| 28 |
|
| 29 |
#---->> DEPEND <<---- |
Archives