commit: d1ae0cebfb7b3008963cbc3acbe0646e7ecaf43f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 00:17:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 00:19:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ae0ceb
toolchain.eclass: ignore GCC version mismatch for live ebuilds
We want to have live ebuilds use e.g. 14.0.9999. not 14.0.1.9999 which is
inconsistent and requires a rename/adjustment to package.accept_keywords files
when going from stage3->stage4 (.0 -> .1).
We can do this now because we use --with-major-version-only nowadays, so
SLOT matches the installed path of just '14'.
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 4cf76229cf88..6a4b59972fa3 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -580,7 +580,7 @@ toolchain_src_prepare() {
setup_multilib_osdirnames
local actual_version=$(< "${S}"/gcc/BASE-VER)
- if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then
+ if ! tc_is_live && [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ;
then
eerror "'${S}/gcc/BASE-VER' contains '${actual_version}',
expected '${GCC_RELEASE_VER}'"
die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'"
fi
