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 0D9AA15800A for ; Wed, 30 Aug 2023 17:25:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 501432BC01C; Wed, 30 Aug 2023 17:25:48 +0000 (UTC) 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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35F6F2BC01C for ; Wed, 30 Aug 2023 17:25:48 +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 48488335D50 for ; Wed, 30 Aug 2023 17:25:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D61CA1076 for ; Wed, 30 Aug 2023 17:25:45 +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: <1693416342.10a55f5559b471e9f1967d9f66ed70a2421d549b.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-117.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 10a55f5559b471e9f1967d9f66ed70a2421d549b X-VCS-Branch: master Date: Wed, 30 Aug 2023 17:25:45 +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: 3d9d26b7-227f-40e2-a2ae-404c91cb2eac X-Archives-Hash: 604bd7970eede5fe22c237a30613dc0d commit: 10a55f5559b471e9f1967d9f66ed70a2421d549b Author: Alfred Wingate protonmail com> AuthorDate: Wed Aug 30 15:01:22 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 30 17:25:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a55f55 www-client/firefox: force use of llvm-readelf Closes: https://bugs.gentoo.org/913130 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32531 Signed-off-by: Joonas Niilola gentoo.org> www-client/firefox/firefox-117.0.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/www-client/firefox/firefox-117.0.ebuild b/www-client/firefox/firefox-117.0.ebuild index 2a9718f34585..03f23bc8a983 100644 --- a/www-client/firefox/firefox-117.0.ebuild +++ b/www-client/firefox/firefox-117.0.ebuild @@ -744,7 +744,6 @@ src_configure() { CXX=${CHOST}-clang++-${version_clang} NM=llvm-nm RANLIB=llvm-ranlib - READELF=llvm-readelf elif ! use clang && ! tc-is-gcc ; then # Force gcc have_switched_compiler=yes @@ -754,7 +753,6 @@ src_configure() { CXX=${CHOST}-g++ NM=gcc-nm RANLIB=gcc-ranlib - READELF=readelf fi if [[ -n "${have_switched_compiler}" ]] ; then @@ -768,7 +766,11 @@ src_configure() { export HOST_CC="$(tc-getBUILD_CC)" export HOST_CXX="$(tc-getBUILD_CXX)" export AS="$(tc-getCC) -c" - tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG + + # Configuration tests expect llvm-readelf output, bug 913130 + READELF="llvm-readelf" + + tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG # Pass the correct toolchain paths through cbindgen if tc-is-cross-compiler ; then