diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-26 22:31:31 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-26 22:32:32 +0000 |
| commit | 3dd25eef1c1ab86a142864cbce3bd46f2db006ce (patch) | |
| tree | da2dd8301154291924eebafc1f8824efda868797 | |
| parent | app-text/editorconfig-core-c: Bump to version 0.12.3 (diff) | |
| download | gentoo-3dd25eef1c1ab86a142864cbce3bd46f2db006ce.tar.gz gentoo-3dd25eef1c1ab86a142864cbce3bd46f2db006ce.tar.bz2 gentoo-3dd25eef1c1ab86a142864cbce3bd46f2db006ce.zip | |
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@gentoo.org>
| -rw-r--r-- | eclass/toolchain.eclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 23b299254690..8796ff10e8ee 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 |