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 A55B115808B for ; Sun, 18 Feb 2024 04:12:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E32ECE29FE; Sun, 18 Feb 2024 04:12:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 pigeon.gentoo.org (Postfix) with ESMTPS id C337DE29FE for ; Sun, 18 Feb 2024 04:12:46 +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 8B6B5341214 for ; Sun, 18 Feb 2024 04:12:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA0CF1082 for ; Sun, 18 Feb 2024 04:12:43 +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: <1708229552.5342a0ba4686d0d75f7bdbf4e8645fa607748d92.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/nspr/nspr-4.35-r2.ebuild X-VCS-Directories: dev-libs/nspr/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5342a0ba4686d0d75f7bdbf4e8645fa607748d92 X-VCS-Branch: master Date: Sun, 18 Feb 2024 04:12:43 +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: b9b11295-d6ba-4ce9-98a3-384eca544a73 X-Archives-Hash: 5e81a134a87dcbfc0a8aca53a78947af commit: 5342a0ba4686d0d75f7bdbf4e8645fa607748d92 Author: Sam James gentoo org> AuthorDate: Sun Feb 18 04:11:59 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 18 04:12:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5342a0ba dev-libs/nspr: sync bitness check from dev-libs/nss Pass -fno-lto to the compiler and -S to file, as we do in dev-libs/nss. Bug: https://bugs.gentoo.org/915890 Bug: https://bugs.gentoo.org/917792 Signed-off-by: Sam James gentoo.org> dev-libs/nspr/nspr-4.35-r2.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-libs/nspr/nspr-4.35-r2.ebuild b/dev-libs/nspr/nspr-4.35-r2.ebuild index efca76733c93..6921c9e1b1ab 100644 --- a/dev-libs/nspr/nspr-4.35-r2.ebuild +++ b/dev-libs/nspr/nspr-4.35-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -96,9 +96,10 @@ multilib_src_configure() { s390x|*64) myconf+=( --enable-64bit );; default) # no abi actually set, fall back to old check einfo "Running a short build test to determine 64bit'ness" + # TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size echo > "${T}"/test.c || die - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in + ${CC} ${CFLAGS} ${CPPFLAGS} -fno-lto -c "${T}"/test.c -o "${T}"/test.o || die + case $(file -S "${T}"/test.o) in *32-bit*x86-64*) myconf+=( --enable-x32 );; *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );; *32-bit*|*ppc*|*i386*) ;;