From 57de8c521625d4a06c3b1ad122f9db4f7494aaa9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 19 Feb 2024 07:12:26 +0000 Subject: [PATCH] dev-libs/nspr: Sync with Gentoo It's from Gentoo commit 5342a0ba4686d0d75f7bdbf4e8645fa607748d92. --- .../portage-stable/dev-libs/nspr/nspr-4.35-r2.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.35-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.35-r2.ebuild index efca76733c..6921c9e1b1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.35-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/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*) ;;