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 D8E8A158013 for ; Sat, 16 Dec 2023 09:53:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C63D2BC017; Sat, 16 Dec 2023 09:53:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16D8E2BC017 for ; Sat, 16 Dec 2023 09:53:30 +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 5B1F133BE19 for ; Sat, 16 Dec 2023 09:53:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2C2A979 for ; Sat, 16 Dec 2023 09:53:27 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1702720404.1387931f892a0eadab06a7f9f6cc2854f1105c24.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/nss/nss-3.96.ebuild X-VCS-Directories: dev-libs/nss/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 1387931f892a0eadab06a7f9f6cc2854f1105c24 X-VCS-Branch: master Date: Sat, 16 Dec 2023 09:53:27 +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: 3a28d730-105e-44a2-b189-7456d9f79cfc X-Archives-Hash: 4d63c2e0415b752925895b11085a108c commit: 1387931f892a0eadab06a7f9f6cc2854f1105c24 Author: Sam James gentoo org> AuthorDate: Sat Dec 16 08:35:46 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 16 09:53:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1387931f dev-libs/nss: fix bitness check for LTO Closes: https://bugs.gentoo.org/917792 Signed-off-by: Sam James gentoo.org> Signed-off-by: Joonas Niilola gentoo.org> dev-libs/nss/nss-3.96.ebuild | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dev-libs/nss/nss-3.96.ebuild b/dev-libs/nss/nss-3.96.ebuild index 5cab1c328c41..35503a7b5874 100644 --- a/dev-libs/nss/nss-3.96.ebuild +++ b/dev-libs/nss/nss-3.96.ebuild @@ -105,19 +105,15 @@ nssarch() { } nssbits() { - # bgo#917792 - if tc-is-clang && use x86 ; then - filter-lto - fi - local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" if [[ ${1} == BUILD_ ]]; then cc=$(tc-getBUILD_CC) else cc=$(tc-getCC) fi + # TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size echo > "${T}"/test.c || die - ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die + ${cc} ${!cppflags} ${!cflags} -fno-lto -c "${T}"/test.c -o "${T}/${1}test.o" || die case $(file "${T}/${1}test.o") in *32-bit*x86-64*) echo USE_X32=1;; *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; @@ -175,10 +171,6 @@ multilib_src_compile() { export CC_IS_GCC=1 elif tc-is-clang; then export CC_IS_CLANG=1 - if use x86 ; then - filter-lto - elog "lto disabled when using clang on x86. bgo#917792" - fi fi export NSS_DISABLE_GTESTS=$(usex !test 1 0)