From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sun, 26 Jan 2020 22:07:10 +0000 (+0000)
Subject: toolchain.eclass: restore an option to override GCC_CONFIG_VER
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a39a55b4db6682b7f99a7f9991eed3ca5bf7c5e;p=gentoo.git

toolchain.eclass: restore an option to override GCC_CONFIG_VER

dev-lang/gnat-gpl ebuilds override this option and affect at
least default slot installed. Let's partially revert the behaviour
until ada is migrated.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 767240eb7f23..3614f870b52b 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -76,7 +76,9 @@ GCCMICRO=$(ver_cut 3 ${GCC_PV})
 # gcc hardcodes it's internal version into gcc/BASE-VER
 # and assumes various directories and tools to have the
 # same name.
-GCC_CONFIG_VER=${GCC_RELEASE_VER}
+# TODO: once ada ebuilds are fixed turn it to
+#     GCC_CONFIG_VER=${GCC_RELEASE_VER}
+GCC_CONFIG_VER=${GCC_CONFIG_VER:-GCC_RELEASE_VER}
 
 # Pre-release support. Versioning schema:
 # 1.0.0_pre9999: live ebuild