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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A3561581FB for ; Sun, 24 Nov 2024 19:02:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5E14E0855; Sun, 24 Nov 2024 19:01:58 +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 733C8E0855 for ; Sun, 24 Nov 2024 19:01:58 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAF1B342F92 for ; Sun, 24 Nov 2024 19:01:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27310D81 for ; Sun, 24 Nov 2024 19:01:46 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1732474900.729c11d560d55971b8f46295fce77afc4e895265.mgorny@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: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 729c11d560d55971b8f46295fce77afc4e895265 X-VCS-Branch: master Date: Sun, 24 Nov 2024 19:01:46 +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: 16fb69b1-b72f-4ccf-ba98-06d3680d058d X-Archives-Hash: 76860d0bd12e52058e394b3bc8de80f7 commit: 729c11d560d55971b8f46295fce77afc4e895265 Author: Michał Górny gentoo org> AuthorDate: Wed Nov 20 16:51:48 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 24 19:01:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729c11d5 toolchain.eclass: Throw an error if trying to disable time64 Throw an error if the user is trying to build a non-time64 version of GCC on a system featuring a time64 GCC already. Most of the time, this will mean that the user has accidentally switched to a non-time64 profile. Signed-off-by: Michał Górny gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/39384 Signed-off-by: Michał Górny gentoo.org> eclass/toolchain.eclass | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 696eec73b4ba..13f3298fea90 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -576,6 +576,19 @@ toolchain_pkg_pretend() { _tc_use_if_iuse objc++ && \ ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"' fi + + # Do the check for pure source builds only, since the override + # cannot work with binary packages, see https://bugs.gentoo.org/944198 + if [[ ${BUILD_TYPE} == source ]] && in_iuse time64 && ! use time64 && + has_version -r "${CATEGORY}/${PN}[time64(-)]" && + [[ ! ${TC_FORCE_TIME32} ]] + then + eerror "Attempting to build USE=-time64 version of gcc when at least" + eerror "one USE=time64 version is installed. Did you accidentally" + eerror "switch back to a non-time64 profile? If this is really" + eerror "desirable, set TC_FORCE_TIME32=1 to force the build." + die "Attempting to build USE=-time64 on a USE=time64 system" + fi } #---->> pkg_setup <<----