toolchain.eclass: make ${GCC_CONFIG_VER} != ${GCC_RELEASE_VER} nonfatal
authorSergei Trofimovich <slyfox@gentoo.org>
Sun, 26 Jan 2020 22:31:31 +0000 (22:31 +0000)
committerSergei Trofimovich <slyfox@gentoo.org>
Sun, 26 Jan 2020 22:32:32 +0000 (22:32 +0000)
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@gentoo.org>
eclass/toolchain.eclass

index 23b2992546905ebfa3b72c941961382f62d53ef6..8796ff10e8ee997ccaef417f169267a63ed7694f 100644 (file)
@@ -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