summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-01-26 19:29:54 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-01-26 20:55:32 +0000
commit068669eb1bc72cb3a4dcb589dc37739e04e174a9 (patch)
tree005bd5fea1adcc9e6ab361cdc50dcff51caa90d3 /eclass/toolchain.eclass
parentnet-vpn/tor: x86 stable (bug #706364) (diff)
downloadgentoo-068669eb1bc72cb3a4dcb589dc37739e04e174a9.tar.gz
gentoo-068669eb1bc72cb3a4dcb589dc37739e04e174a9.tar.bz2
gentoo-068669eb1bc72cb3a4dcb589dc37739e04e174a9.zip
toolchain.eclass: don't override release vesion, assert it instead
Closes: https://bugs.gentoo.org/706240 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass/toolchain.eclass')
-rw-r--r--eclass/toolchain.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index a535707f7ece..97c9e585723e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -568,8 +568,10 @@ toolchain_src_prepare() {
gcc_version_patch
if tc_version_is_at_least 4.1 ; then
- if [[ -n ${SNAPSHOT} ]] || tc_is_live ; then
- echo "${GCC_CONFIG_VER}" > "${S}"/gcc/BASE-VER
+ 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}...'"
fi
fi
@@ -799,7 +801,7 @@ gcc_version_patch() {
# gcc-4.3+ has configure flags (whoo!)
tc_version_is_at_least 4.3 && return 0
- local version_string=${GCC_CONFIG_VER}
+ local version_string=${GCC_RELEASE_VER}
einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})"