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 BE5361581EC for ; Tue, 19 Nov 2024 14:50:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F04C3E07EE; Tue, 19 Nov 2024 14:50:31 +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 D684FE07EE for ; Tue, 19 Nov 2024 14:50:31 +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 D26443409C8 for ; Tue, 19 Nov 2024 14:50:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1C8CAED for ; Tue, 19 Nov 2024 14:50:28 +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: <1732027808.f6a974f8f2378c6c6a83345c101afce233fdf1d7.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: f6a974f8f2378c6c6a83345c101afce233fdf1d7 X-VCS-Branch: master Date: Tue, 19 Nov 2024 14:50:28 +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: f3a247a8-fb98-48a4-bf72-f63b528f57ac X-Archives-Hash: 9d4888e3ab0deaab777664d5888d076f commit: f6a974f8f2378c6c6a83345c101afce233fdf1d7 Author: Sam James gentoo org> AuthorDate: Tue Nov 19 14:49:04 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 19 14:50:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a974f8 toolchain.eclass: fix libdiagnostics handling Reported by ulm. This was introduced by a last-minute simplification I made, but USE=libdiagnostics only exists for 9999 and the *next* snapshot, not the current one, but even then, the code was wrong for < 15 as the use_enable part was run unconditionally w/ USE=jit. Fixes: b923a4c0d1a330e40f0a05f3bc94bb4f32ce1cbb Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index edff7254c905..e28479dc44af 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1761,7 +1761,6 @@ toolchain_src_configure() { --enable-host-shared --enable-languages=jit - $(use_enable libdiagnostics) # Might be used for the just-built GCC. Easier to just # respect USE=graphite here in case the user passes some @@ -1771,6 +1770,10 @@ toolchain_src_configure() { --with-system-zlib ) + if tc_version_is_at_least 15.0.0_pre20241124 ; then + confgcc_jit+=( $(use_enable libdiagnostics) ) + fi + if tc_version_is_at_least 13.1 ; then confgcc_jit+=( --disable-fixincludes ) fi