[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sergei Trofimovich]

commit:     3dd25eef1c1ab86a142864cbce3bd46f2db006ce
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 22:31:31 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 22:32:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd25eef

toolchain.eclass: make ${GCC_CONFIG_VER} != ${GCC_RELEASE_VER} nonfatal

dev-lang/gnat-gpl uses ${GCC_CONFIG_VER} to override exposed gcc
version. Let's keep it nonfatal until ada ebuilds are fixed.

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

 eclass/toolchain.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 23b29925469..8796ff10e8e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -574,7 +574,9 @@ toolchain_src_prepare() {
                local actual_version=$(< "${S}"/gcc/BASE-VER)
                if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then
                        eerror "'${S}/gcc/BASE-VER' contains 
'${actual_version}', expected '${GCC_RELEASE_VER}'"
-                       die "Please rename ebuild to 
'${PN}-${actual_version}...'"
+                       # TODO: once ada ebuilds are fixed turn it to 'die'
+                       eerror "Please set GCC_RELEASE_VER to 
'${actual_version}'"
+                       echo "${GCC_CONFIG_VER}" > "${S}"/gcc/BASE-VER
                fi
        fi