| 1 |
commit: 3293bae77263dd73adf3cf651863033ca3698055 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 9 11:43:12 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 11:46:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3293bae7 |
| 7 |
|
| 8 |
toolchain.eclass: don't allow overriding GCC_CONFIG_VER |
| 9 |
|
| 10 |
dev-lang/gnat-gpl migrated from GCC_CONFIG_VER to TOOLCHAIN_GCC_PV. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/706588 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/toolchain.eclass | 17 +++++++++++------ |
| 16 |
1 file changed, 11 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 19 |
index 03e335dac5c..ef23d8b0b67 100644 |
| 20 |
--- a/eclass/toolchain.eclass |
| 21 |
+++ b/eclass/toolchain.eclass |
| 22 |
@@ -67,18 +67,23 @@ tc_version_is_between() { |
| 23 |
GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}} |
| 24 |
GCC_PVR=${GCC_PV} |
| 25 |
[[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR} |
| 26 |
+ |
| 27 |
+# GCC_RELEASE_VER must always match 'gcc/BASE-VER' value. |
| 28 |
+# It's an internal representation of gcc version used for: |
| 29 |
+# - versioned paths on disk |
| 30 |
+# - 'gcc -dumpversion' output. Must always match <digit>.<digit>.<digit>. |
| 31 |
GCC_RELEASE_VER=$(ver_cut 1-3 ${GCC_PV}) |
| 32 |
+ |
| 33 |
GCC_BRANCH_VER=$(ver_cut 1-2 ${GCC_PV}) |
| 34 |
GCCMAJOR=$(ver_cut 1 ${GCC_PV}) |
| 35 |
GCCMINOR=$(ver_cut 2 ${GCC_PV}) |
| 36 |
GCCMICRO=$(ver_cut 3 ${GCC_PV}) |
| 37 |
|
| 38 |
-# gcc hardcodes it's internal version into gcc/BASE-VER |
| 39 |
-# and assumes various directories and tools to have the |
| 40 |
-# same name. |
| 41 |
-# TODO: once ada ebuilds are fixed turn it to |
| 42 |
-# GCC_CONFIG_VER=${GCC_RELEASE_VER} |
| 43 |
-GCC_CONFIG_VER=${GCC_CONFIG_VER:-${GCC_RELEASE_VER}} |
| 44 |
+# Ideally this variable should allow for custom gentoo versioning |
| 45 |
+# of binary and gcc-config names not directly tied to upstream |
| 46 |
+# versioning. In practive it's hard to untangle from gcc/BASE-VER |
| 47 |
+# (GCC_RELEASE_VER) value. |
| 48 |
+GCC_CONFIG_VER=${GCC_RELEASE_VER} |
| 49 |
|
| 50 |
# Pre-release support. Versioning schema: |
| 51 |
# 1.0.0_pre9999: live ebuild |
Archives