commit:     5342a0ba4686d0d75f7bdbf4e8645fa607748d92
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 04:11:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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*) ;;

Reply via email to