| 1 |
commit: 66666c48e0856461169819b1f23a551077bb5a15 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 9 12:02:18 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 12:06:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66666c48 |
| 7 |
|
| 8 |
toolchain.eclass: assert GCC_RELEASE_VER to match gcc/BASE-VER |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/706588 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/toolchain.eclass | 4 +--- |
| 14 |
1 file changed, 1 insertion(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 17 |
index e280ee07eb6..71c3cbc8c76 100644 |
| 18 |
--- a/eclass/toolchain.eclass |
| 19 |
+++ b/eclass/toolchain.eclass |
| 20 |
@@ -536,9 +536,7 @@ toolchain_src_prepare() { |
| 21 |
local actual_version=$(< "${S}"/gcc/BASE-VER) |
| 22 |
if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then |
| 23 |
eerror "'${S}/gcc/BASE-VER' contains '${actual_version}', expected '${GCC_RELEASE_VER}'" |
| 24 |
- # TODO: once ada ebuilds are fixed turn it to 'die' |
| 25 |
- eerror "Please set GCC_RELEASE_VER to '${actual_version}'" |
| 26 |
- echo "${GCC_CONFIG_VER}" > "${S}"/gcc/BASE-VER |
| 27 |
+ die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'" |
| 28 |
fi |
| 29 |
fi |
Archives