From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E5BA15815E for ; Mon, 5 Feb 2024 00:20:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBB59E29D3; Mon, 5 Feb 2024 00:20:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9505CE29D3 for ; Mon, 5 Feb 2024 00:20:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E7A9335DC8 for ; Mon, 5 Feb 2024 00:20:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18C581492 for ; Mon, 5 Feb 2024 00:20:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1707092374.d1ae0cebfb7b3008963cbc3acbe0646e7ecaf43f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d1ae0cebfb7b3008963cbc3acbe0646e7ecaf43f X-VCS-Branch: master Date: Mon, 5 Feb 2024 00:20:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0f75f642-1063-46c7-b6ba-a9bc74cf4b11 X-Archives-Hash: 570c82a7ab961329befbb8c344de7c1f commit: d1ae0cebfb7b3008963cbc3acbe0646e7ecaf43f Author: Sam James gentoo org> AuthorDate: Mon Feb 5 00:17:45 2024 +0000 Commit: Sam James gentoo 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 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