From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 5CB7E1584AD for ; Thu, 17 Apr 2025 01:27:20 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 44121343143 for ; Thu, 17 Apr 2025 01:27:20 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 36010110494; Thu, 17 Apr 2025 01:27:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 2AC98110494 for ; Thu, 17 Apr 2025 01:27:19 +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 CFE59343142 for ; Thu, 17 Apr 2025 01:27:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC51CFBE for ; Thu, 17 Apr 2025 01:27:16 +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: <1744853179.6335bd10dfd41fa1f1a508c9e4d3458b6ae39a91.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: 6335bd10dfd41fa1f1a508c9e4d3458b6ae39a91 X-VCS-Branch: master Date: Thu, 17 Apr 2025 01:27:16 +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: ca53d605-71ee-4dd1-af2e-309ce6c2ea58 X-Archives-Hash: ebe958c02398fb38c881cfdce5bf0c38 commit: 6335bd10dfd41fa1f1a508c9e4d3458b6ae39a91 Author: Sam James gentoo org> AuthorDate: Thu Apr 17 01:25:50 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 17 01:26:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6335bd10 toolchain.eclass: extend JIT location hack to libgdiagnostics too libgccjit is strange in that it's a non-internal library installed by GCC and isn't intended to be interacted with via some magic options like -fopenmp or whatever, but just linked like a regular library. libgdiagnostics is the same, so extend the same treatment to it. Thanks to tdr for testing. Closes: https://bugs.gentoo.org/953823 Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index ebb63901fba5..df6ed170fe1f 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2782,10 +2782,15 @@ gcc_movelibs() { # libgccjit gets installed to /usr/lib, not /usr/$(get_libdir). Probably # due to a bug in gcc build system. if [[ ${PWD} == "${WORKDIR}"/build-jit ]] ; then - if is_jit || _tc_use_if_iuse libgdiagnostics ; then - dodir "${LIBPATH#${EPREFIX}}" + dodir "${LIBPATH#${EPREFIX}}" + + if is_jit ; then mv "${ED}"/usr/lib/libgccjit* "${D}${LIBPATH}" || die fi + + if _tc_use_if_iuse libgdiagnostics ; then + mv "${ED}"/usr/lib/libgdiagnostics* "${D}${LIBPATH}" || die + fi fi # For all the libs that are built for CTARGET, move them into the