[gentoo-commits] repo/gentoo:master commit in: net-libs/xdp-tools/

["Sam James" <sam@gentoo.org>]

commit:     36b6b67f771d5ec4373578e1599c013b7e679b24
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Thu Nov  2 11:17:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 12:02:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36b6b67f

net-libs/xdp-tools: force use of ld.bfd

lld needs special care for embeddings in object files and this is not (yet)
supported by upstream, so just force ld.bfd instead of creating more
complications.

Bug: https://bugs.gentoo.org/916591
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/xdp-tools/xdp-tools-1.4.1.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild
index 5fd0485f706d..520357d07664 100644
--- a/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild
@@ -45,8 +45,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# filter LTO: #861587
+	filter-lto
+
+	# filter LDFLAGS some more: #916591
+	filter-ldflags -Wl,--{icf,lto}*
+
+	# force ld.bfd: #916591
+	tc-ld-force-bfd
+
 	export CC="$(tc-getCC)"
-	export LD="$(tc-getLD)"
 	export PREFIX="${EPREFIX}/usr"
 	export LIBDIR="${PREFIX}/$(get_libdir)"
 	export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
@@ -54,9 +62,6 @@ src_configure() {
 	export DYNAMIC_LIBXDP=1
 	export FORCE_SYSTEM_LIBBPF=1
 
-	# bug 861587
-	filter-lto
-
 	default
 }