gentoo auto-resync : 21:03:2024 - 07:00:13

4 files changed, 21 insertions, 146 deletions

diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 0648611e21a6..aad6960bbcef 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,8 +1,6 @@
-AUX 1.4.0-no-Werror.patch 2521 BLAKE2B e424b9fb203b78d45f49c5a1264c01509b6da2a95914ca713e43d9e444a5a3b360323b44bdba547035dff46d880197626eb0999532772c5f2757205c280ff272 SHA512 06a10e5c7bf4bf841dfab692c9dc18b8d1a1730426f4ef92de278a604a98aa7833dff547fd6ecc284d0f0111c0e1011bd8d14315451f0e5963ca64264e8891b7
-AUX 1.4.0-toolchain.patch 2479 BLAKE2B c907fa98fff2ad93d0f72d75237bff6fc7aab05e10e76d5b30555b0a7d64f6012f1555d806acf0127019d0ec2f39eeeb7741d62bf858ab1d9da5e9c85fc33c48 SHA512 6321960eca342a2d89e2118c0c8826dd415871e79e9f7685e1d4b44d1e2af987cc7a4c893c1b98578df8075e0705d1279131c6e2356ca5fd86d4c3d8ba22495d
 AUX 1.4.1-fix-memory-leak-in-xsk_setup_xdp_prog.patch 1120 BLAKE2B c922ec5fec6b4a7d73289a56aab40505dfca1d79ec36038631e6c337fcc5aa6c22671110b278bfd9e8fc68410a212bf3a1b9bdc8a61e867d0c803c554607e266 SHA512 05387a2625dc25349d8ac941c16fc0fd9216453c771cdd166bfef0afba61df512888bd9e14b55222f51b5956fd54db41b45be0487fd8fc0fd65d861109837aac
-DIST xdp-tools-1.4.0.tar.gz 337221 BLAKE2B 008dda0fcfd403e47ab2b8c801fc0a5c4e103fb3b9869f1d1bf5af258fc646dd5a0285d3126c012c9b81805408b9669da886b9fcf2fdf33b256f74bbf898222a SHA512 c17bd6e9e6e4cf59c33f4b9ae4e3e0434863d147abf80f87b425215261b96d4574898fa09cc2b201a427a5e9d49ad64d0c70e50e3f72e3a18c6fbdf7f4cd4a3a
 DIST xdp-tools-1.4.1.tar.gz 339878 BLAKE2B 30ed245dd0da8404cf67313ea4d5f9a148507d14bd7330bdac3b03c07d1cc0b38eb1a376636551cb8ea14c8a2e77d02527da363733a1059e1c2ebaee9ac90392 SHA512 9d2ad42713aa53c10ccbde2c344bf2696524e317544f3693114b343ab74240187699c3802cfc6efa05b3e9f9bfec80fd2537799aa3ae050717bb1f6aab435996
-EBUILD xdp-tools-1.4.0.ebuild 2031 BLAKE2B e7a741b9038e1e1723fd02929c89e8522c37646edc9c14d9dbdcd90c0cc80e4c5846a1d56f7337ceaec32a087ff2cd1a24a922ff2619ba0bc3435af054ed6ee9 SHA512 3c4769533b3841ea3a0242cec4caf91f931ba0fd6db3109e854f7c59cb44383e36c19187a19beb6ef9f22166ece7f6cb1bbaf3b040b66b006ac544af00282a3b
+DIST xdp-tools-1.4.2.tar.gz 340864 BLAKE2B c5197330ff917043e03a16346823acab760db5fe903f2e039bd2c178ad34bb04d96a0d6b321fd3565256c39422f3f1f7b475970bd22ab487e30468c96e11c711 SHA512 aedf79859872523d514f18e7a6e8b7999bd1942021968dbba9a7e86cde1c193e31b328bc56d6bf2b3fbc7f266c9df8d942d90a70bbd9d514ce38d56c07cd18ca
 EBUILD xdp-tools-1.4.1-r1.ebuild 2358 BLAKE2B f9973bea06b0b725c5129783e3bfdda194ff5fd50fec0b3d60e04efa5fdfe38c7b5438344107a9923625de4dad63544e53448a97ba633c10ffca1c40f3efd0c6 SHA512 99510b221167078abb9b0c97330fb74d8913401ec93bb045914896b01822c8b1081f52d34b6a3893bfcff4c7ebeb91739fd378507f364a25443bc1d4c98dd418
+EBUILD xdp-tools-1.4.2.ebuild 2281 BLAKE2B 9688a8d834a659c0d59d97d521188040eb7fa5cd3e7368d53222da5cc796d5002fe480b80e1423986766c773e1d57d2df4ce40d0bf1f53e673c1eb6c09332dd4 SHA512 087f92f9a3f82ebb2f267c46202e4b875d59408636decd32b7c7bae2d238318f8bf11565aa2ffaa1936b3c4490d51218a1c73fa8319864a777d24a56cca17a81
 MISC metadata.xml 731 BLAKE2B a9c958d31f9ece376e4518e213823c14474df47747205020b76da7a0a67f7ed926ec55002b586143ce84cb965a23ad1794a42862597278682ef3605fc7d07911 SHA512 78774e4bcc6e05d56fe82b0aacd46e4d23e3bd89aa5bb55900adb94648d06b3251c575d4d0b6108cdad0f2ffbabcc2973e50e804b120a73e8923cd679601384f
diff --git a/net-libs/xdp-tools/files/1.4.0-no-Werror.patch b/net-libs/xdp-tools/files/1.4.0-no-Werror.patch
deleted file mode 100644
index fb086f5122b9..000000000000
--- a/net-libs/xdp-tools/files/1.4.0-no-Werror.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-
-Bug: https://bugs.gentoo.org/899744
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 5ee035d..5342ab3 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,5 +1,5 @@
- 
--LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Werror -Wall) -fPIC
-+LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Wall) -fPIC
- 
- LIB_DIR = .
- include defines.mk
-diff --git a/lib/common.mk b/lib/common.mk
-index b680a75..8dbcb39 100644
---- a/lib/common.mk
-+++ b/lib/common.mk
-@@ -116,7 +116,6 @@ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
-diff --git a/lib/defines.mk b/lib/defines.mk
-index 54b259f..ed246c0 100644
---- a/lib/defines.mk
-+++ b/lib/defines.mk
-@@ -40,7 +40,7 @@ endif
- 
- DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
--CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES)
-+CFLAGS += -std=gnu11 -Wextra $(DEFINES)
- BPF_CFLAGS += $(DEFINES) $(filter -ffile-prefix-map=%,$(CFLAGS))
- 
- CONFIGMK := $(LIB_DIR)/../config.mk
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index 431932a..a0c625d 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -142,7 +142,6 @@ $(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
-diff --git a/lib/libxdp/tests/Makefile b/lib/libxdp/tests/Makefile
-index 3c22901..a4463f3 100644
---- a/lib/libxdp/tests/Makefile
-+++ b/lib/libxdp/tests/Makefile
-@@ -72,7 +72,6 @@ $(BPF_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK) $(EXTRA_DEPS)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
-diff --git a/lib/util/Makefile b/lib/util/Makefile
-index 24070f0..37485b3 100644
---- a/lib/util/Makefile
-+++ b/lib/util/Makefile
-@@ -26,7 +26,6 @@ $(UTIL_BPF_OBJS): %.o: %.c $(KERN_USER_H) $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
diff --git a/net-libs/xdp-tools/files/1.4.0-toolchain.patch b/net-libs/xdp-tools/files/1.4.0-toolchain.patch
deleted file mode 100644
index d4bcb511310f..000000000000
--- a/net-libs/xdp-tools/files/1.4.0-toolchain.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-
-Patch from: https://github.com/xdp-project/xdp-tools/pull/341
-
-From b1377b35cd05daf4d3afc3d59839e9889a642ffb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Sat, 8 Jul 2023 12:34:20 +0200
-Subject: [PATCH] libxdp: don't use direct call to readelf for symbol table
- comparison
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Gentoo CI previously reported symbol mismatches in libxdp
-(see #302 and https://bugs.gentoo.org/899742). This was
-caused by a direct call to 'readelf' instead of using the
-command injected by the environment/toolchain.
-The fix is simple: use $(READELF).
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
----
- lib/libxdp/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index 43de3e8a..532e0687 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -93,12 +93,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(SHARED_OBJDIR)
- 
- XDP_IN_SHARED	:= $(SHARED_OBJDIR)/libxdp.o $(SHARED_OBJDIR)/xsk.o
- 
--GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
-+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
- 			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
- 			   sed 's/\[.*\]//' | \
- 			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
- 			   sort -u | wc -l)
--VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
-+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
- 			      grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
- 
- check: $(CHECK_RULES)
-@@ -110,12 +110,12 @@ check_abi: $(OBJDIR)/libxdp.so
- 		     "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
- 		     "Please make sure all symbols are"	 \
- 		     "versioned in $(VERSION_SCRIPT)." >&2;		 \
--		readelf -s --wide $(XDP_IN_SHARED) |			 \
-+		$(READELF) -s --wide $(XDP_IN_SHARED) |			 \
- 		    cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' |	 \
- 		    sed 's/\[.*\]//' |					 \
- 		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'|  \
- 		    sort -u > $(OUTPUT)libxdp_global_syms.tmp;		 \
--		readelf --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
-+		$(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
- 		    grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 |		 \
- 		    sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; 	 \
- 		diff -u $(OUTPUT)libxdp_global_syms.tmp			 \
diff --git a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild
index fb70b301ec4d..6617263e054b 100644
--- a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+tools"
 
 DEPEND="
@@ -32,14 +32,26 @@ QA_PREBUILT="usr/lib/bpf/*.o"
 
 MAKEOPTS+=" V=1"
 
-PATCHES=(
-	"${FILESDIR}"/1.4.0-no-Werror.patch
-	"${FILESDIR}"/1.4.0-toolchain.patch
-)
+src_prepare() {
+	# remove -Werror: #899744
+	sed -i 's/-Werror//g' lib/Makefile lib/defines.mk || die
+	sed -i '/-Werror/d' lib/common.mk lib/libxdp/Makefile \
+		lib/libxdp/tests/Makefile lib/util/Makefile || die
+
+	default
+}
 
 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"
@@ -47,9 +59,6 @@ src_configure() {
 	export DYNAMIC_LIBXDP=1
 	export FORCE_SYSTEM_LIBBPF=1
 
-	# bug 861587
-	filter-lto
-
 	default
 }