From dc41efad78c64df9b74ed6f94dcf25391b8fc5e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 9 Mar 2024 18:44:29 +0000
Subject: gentoo auto-resync : 09:03:2024 - 18:44:28

---
 sys-devel/binutils/Manifest             |  2 +-
 sys-devel/binutils/binutils-9999.ebuild | 32 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'sys-devel/binutils')

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 1f5681973351..712cf83f152b 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -44,5 +44,5 @@ EBUILD binutils-2.41-r3.ebuild 14907 BLAKE2B 79adbbdbcbc09e230660824b8a856edff4f
 EBUILD binutils-2.41-r4.ebuild 15103 BLAKE2B 88ec8426b6ccf6c0c84e732a7dd0a5f480e5663334c423b6216cd5239ce8eede5a7161ad7d933674d39ffe385c5ae6cb1c30c6579cf2b5f76cecfabfca9f2b26 SHA512 8e6b5e47388a20709b06ef97d4b7fb4c19405c2d8aba4a97df30a312f617f3af6d42274ad8bc1b32f2903784a2ccb64747b14513d8304810957729da94b396db
 EBUILD binutils-2.41-r5.ebuild 15095 BLAKE2B 42661f54de036887565ff3d6aeb00ca902d407fc7ba4a356a069e9c0fd34196b52d46c5bff19d000deab025fd38ebb6a8f49373b254db12a5420e4e9f4058688 SHA512 98fbe626a4533807206206bbe97012bdc8460f45c73b03895df37e649e517352ce87b43019e6926269397b64a24471f13cf98ddd03b3879f3195205ffec52924
 EBUILD binutils-2.42-r1.ebuild 15236 BLAKE2B 003aa7bbb0907693dba6476d00bca675aab275dbbc40f0293af6c93ed3006e42071168fb4952451adec3d46cadb258256b8dbde85e40ed798bb0f9266dac0234 SHA512 053b5690f37154f0eeebfdb7ce1b47a6cf8a19883f711840eefed0fa5bdaa018437657fe26296b23383cd35dfb9a21470654a055ba22a67825398757e8fb653a
-EBUILD binutils-9999.ebuild 15237 BLAKE2B 59e2ddae3757b8a5ef0665f3655ee860232c5f56c4df9139e951a63c5d97fb752290639a268cacfd6a14bff815c38587e98dfc79b08e192022a6cad5409972c5 SHA512 0537582f7a17d0f8a69a53866198e2a226b995d0f8fc17bb96bff1daa78236d07e74fa8183122d83094b3bc30f22f60cbc20171e506f5de249d6ba5510aee1bd
+EBUILD binutils-9999.ebuild 15971 BLAKE2B 55bbf20550b801e5dfe557ea74b575dece0efdb785b864024437f31e76b525a06699c48eb69a54d943243d804bf2440bbcc0713a46cad94d9b5d99ec10bd0f45 SHA512 9077a5d687558243b786dae8033ffb93d9ddf20e1416892f24eef5b30e08bc46de074e9171ef8b0886e49f604808241de5dd5c40740e64c63ab7b7d2198030f1
 MISC metadata.xml 995 BLAKE2B 85ccdd924f8c459a4cd7e608dff59c7281523da0d9457b0094b97e140cd07a300cb38383d9402808859100ca0bf219ce86e367bb5282216121bd81f68d588c17 SHA512 3ee538640e5d8c0efe6b8cf1de299e0d78965dece1ad814384844e8e24db72b11ca30d5fb68dfae2e71046d35aee0e71ee3ecbda3730ca49446dd0b2cd0f817c
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 9169e3ca712c..9b30843ce94f 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -333,10 +333,20 @@ src_configure() {
 		)
 	fi
 
+	if use test || { use pgo && tc-is-lto ; } ; then
+		# -Wa,* needs to be consistent everywhere or lto-wrapper will complain
+		filter-flags '-Wa,*'
+	fi
+
 	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
+		myconf+=( $(use_enable pgo pgo-build $(tc-is-lto && echo "lto" || echo "yes")) )
 
 		if use pgo ; then
+			# We let configure handle it for us because it has to run
+			# the testsuite later on for profiling, and LTO isn't compatible
+			# with the testsuite.
+			filter-lto
+
 			export BUILD_CFLAGS="${CFLAGS}"
 		fi
 	fi
@@ -378,10 +388,24 @@ src_test() {
 	local -x XZ_OPT="-T1"
 	local -x XZ_DEFAULTS="-T1"
 
-	# bug #637066
-	filter-flags -Wall -Wreturn-type
+	(
+		# Tests don't expect LTO
+		filter-lto
 
-	emake -k check
+		# lto-wrapper warnings which confuse tests
+		filter-flags '-Wa,*'
+
+		# bug #637066
+		filter-flags -Wall -Wreturn-type
+
+		emake -k check \
+			CFLAGS_FOR_TARGET="${CFLAGS_FOR_TARGET:-${CFLAGS}}" \
+			CXXFLAGS_FOR_TARGET="${CXXFLAGS_FOR_TARGET:-${CXXFLAGS}}" \
+			LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}" \
+			CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			LDFLAGS="${LDFLAGS}"
+	)
 }
 
 src_install() {
-- 
cgit v1.2.3