From 0fcaac21e786bd7911b1e8f436cd885c5e2f6437 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Oct 2023 08:42:41 +0100 Subject: gentoo auto-resync : 27:10:2023 - 08:42:41 --- net-libs/xdp-tools/Manifest | 15 ++-- .../files/1.3.1-disable-stack-protector.patch | 32 -------- .../files/1.3.1-fix-btf__type_cnt-detection.patch | 36 --------- net-libs/xdp-tools/files/1.3.1-musl.patch | 28 ------- net-libs/xdp-tools/files/1.3.1-no-Werror.patch | 75 ------------------ net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch | 36 --------- net-libs/xdp-tools/files/1.4.0-no-Werror.patch | 75 ++++++++++++++++++ net-libs/xdp-tools/files/1.4.1-no-Werror.patch | 75 ++++++++++++++++++ net-libs/xdp-tools/xdp-tools-1.2.8.ebuild | 52 ------------- net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild | 88 ---------------------- net-libs/xdp-tools/xdp-tools-1.4.0.ebuild | 4 +- net-libs/xdp-tools/xdp-tools-1.4.1.ebuild | 86 +++++++++++++++++++++ 12 files changed, 243 insertions(+), 359 deletions(-) delete mode 100644 net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch delete mode 100644 net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch delete mode 100644 net-libs/xdp-tools/files/1.3.1-musl.patch delete mode 100644 net-libs/xdp-tools/files/1.3.1-no-Werror.patch delete mode 100644 net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch create mode 100644 net-libs/xdp-tools/files/1.4.0-no-Werror.patch create mode 100644 net-libs/xdp-tools/files/1.4.1-no-Werror.patch delete mode 100644 net-libs/xdp-tools/xdp-tools-1.2.8.ebuild delete mode 100644 net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild create mode 100644 net-libs/xdp-tools/xdp-tools-1.4.1.ebuild (limited to 'net-libs/xdp-tools') diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest index f800d29d3c1e..e65e3f54c4af 100644 --- a/net-libs/xdp-tools/Manifest +++ b/net-libs/xdp-tools/Manifest @@ -1,13 +1,8 @@ -AUX 1.3.1-disable-stack-protector.patch 1085 BLAKE2B 2afb9ae8f79c2aa9c65d07a509c60b2377b949edd61703652c38bf30fa0fe12357d9cbb4257bd7b421ebebdfab2f8c60e06ab915bd9595aa8a839bc7f23effa2 SHA512 cbfb776915f1606c79510a8a8bdd7681d53c544ee66de15dd879f22df0ff2fe1c5716ef3da4221641f76dac5549d3f8de0b643b9a6fa100f609ff0c9f33e2634 -AUX 1.3.1-fix-btf__type_cnt-detection.patch 1750 BLAKE2B 7086a709a02f7ea00c709373242cede140ff268c395afb97cba4754182e74e72bfdd300afba4cdc273168f78e63ecda5c58e957d66fa826fcb8ff4615714eded SHA512 27e3b4fe413230471aaffdd9c105ad739351b87914e48b01ed2fefd95213a60fc1ec237921036ca8115f48367d4c965b61002b33037955ba1c6447a497e42912 -AUX 1.3.1-musl.patch 869 BLAKE2B bfa1d267d6e9129943a3f6ac2c92d43d301d642435e756537324565b7a0f7d49ca77a966a4c2cb76a9300d189cf376da2aeed1ec5340ed92e03b230a48602378 SHA512 5e729cf3f75467a865c75cd0087a44179007df420d48e7658a5e6b9b15f10d97c9ff592bb951f83bced408602f068d15458dc35c2f7ada21a843c2aa3c454609 -AUX 1.3.1-no-Werror.patch 2521 BLAKE2B e424b9fb203b78d45f49c5a1264c01509b6da2a95914ca713e43d9e444a5a3b360323b44bdba547035dff46d880197626eb0999532772c5f2757205c280ff272 SHA512 06a10e5c7bf4bf841dfab692c9dc18b8d1a1730426f4ef92de278a604a98aa7833dff547fd6ecc284d0f0111c0e1011bd8d14315451f0e5963ca64264e8891b7 -AUX 1.3.1-xdpdump-clang.patch 1381 BLAKE2B 860f505dbef740aded6440d53e864cb82714ccd2ca0d475f0c0faab7228c0f9ccc88ee627b4708732f49016fcc2507cf1d2470d17864a521218e4111332a420f SHA512 d380f948fdca80a5816432f39f54263c11a6d4589af10e85a9f25d8de1d0b8d1fb0f6c8fe0c424fbee9fb43b8bf8000f7d1fea1a0d5418bacc62c2321780d7f2 +AUX 1.4.0-no-Werror.patch 2521 BLAKE2B e424b9fb203b78d45f49c5a1264c01509b6da2a95914ca713e43d9e444a5a3b360323b44bdba547035dff46d880197626eb0999532772c5f2757205c280ff272 SHA512 06a10e5c7bf4bf841dfab692c9dc18b8d1a1730426f4ef92de278a604a98aa7833dff547fd6ecc284d0f0111c0e1011bd8d14315451f0e5963ca64264e8891b7 AUX 1.4.0-toolchain.patch 2479 BLAKE2B c907fa98fff2ad93d0f72d75237bff6fc7aab05e10e76d5b30555b0a7d64f6012f1555d806acf0127019d0ec2f39eeeb7741d62bf858ab1d9da5e9c85fc33c48 SHA512 6321960eca342a2d89e2118c0c8826dd415871e79e9f7685e1d4b44d1e2af987cc7a4c893c1b98578df8075e0705d1279131c6e2356ca5fd86d4c3d8ba22495d -DIST xdp-tools-1.2.8.tar.gz 253786 BLAKE2B f745085b73da5193c3cdaf60c20dfa5de62f3d83487413c87b4c3d07b755dcf91cfbeb4ba970b4e04eef74b4cec4238057f4462074f49b7139d7652cb0f22998 SHA512 6ada9e433fcbefd13cebdffe93c3ce9159e9e09f1498d1615918ca6ecc4f11f03fcd9096980e8ceb7de126d4d8b953fa64917e777d54b5a3dfd1a9556de81626 -DIST xdp-tools-1.3.1.tar.gz 330516 BLAKE2B 89a61f47ba26efe6d0630d971e913e034d111d05c896e5af1bb28e6cb4e94133e6ecd827a10ee12a935ae2e6856f04556ac564ded1bcc65182766d656f8d0c5f SHA512 9dd434095a043158d14fb6829fa632fc4a0714dc0b6e08c219dfb55cb9f34005300db750115e08bd54210e90142bd499904616da077b8aa827e4de28c31be637 +AUX 1.4.1-no-Werror.patch 2572 BLAKE2B 84b12eb07711e98d1152a4edc2b128875c3097bb83dca81939654a201c31ca4db8ad5dae93408d1735bff93330a703b98bdfebae7f4a23312b591b8f8101c514 SHA512 d2ba04104e601bdae59ebeede4ffb950f342b559363e09944c9f3da83ad277db2a9410268bf14fc59136890f3e0cfd20a29041a1879f4cb70e70788f033dfdf1 DIST xdp-tools-1.4.0.tar.gz 337221 BLAKE2B 008dda0fcfd403e47ab2b8c801fc0a5c4e103fb3b9869f1d1bf5af258fc646dd5a0285d3126c012c9b81805408b9669da886b9fcf2fdf33b256f74bbf898222a SHA512 c17bd6e9e6e4cf59c33f4b9ae4e3e0434863d147abf80f87b425215261b96d4574898fa09cc2b201a427a5e9d49ad64d0c70e50e3f72e3a18c6fbdf7f4cd4a3a -EBUILD xdp-tools-1.2.8.ebuild 1261 BLAKE2B 800efd8b697d0fe6e2e5fae5c34deb9b299aec42a4aa437b43a63cce77356c0d71107728a369287910f2d5948a24cf467518c3ce7809edbdf2baee27338b5d69 SHA512 40847494eeac46981c8a5beb41ea321a31656d37fd94b0cdeb010c1f084a6bd06d1bf61f3bc7ce319ba59b27eb82781e2922b4f33f317f4a26e42fcfca7a0faf -EBUILD xdp-tools-1.3.1-r3.ebuild 2101 BLAKE2B c6cc87b206a6f3c52bf983a6c82c934b35d5007059eac8051744fa4e95ea9759660301e7d38b4319e614482ad1562196c384794c7143e314439824dec4d2aab4 SHA512 530d8daa9a09c01edbf33d5c429cf623e7f72e8305c526e71aeac0b463abfa25f7872025f0f8081a41bbd91499745debe07f42161cbed3219d94fa785e1b23f5 -EBUILD xdp-tools-1.4.0.ebuild 2015 BLAKE2B c39c78ffa6e8ddfb574de8398c669176a49ca9a4576e254609be811ea1776839ad68cbbe69ac3347f1a9bcc4548750722af77cc089a8e45ffb600032b8979df1 SHA512 b134bc437af3b72c8f6ae3a51b295ba4bd3488e23bb0c7e795884934dc27bff0bf99e142a566773043228eb8d776467b48339a8de8f3c86423f57758d52eafd8 +DIST xdp-tools-1.4.1.tar.gz 339878 BLAKE2B 30ed245dd0da8404cf67313ea4d5f9a148507d14bd7330bdac3b03c07d1cc0b38eb1a376636551cb8ea14c8a2e77d02527da363733a1059e1c2ebaee9ac90392 SHA512 9d2ad42713aa53c10ccbde2c344bf2696524e317544f3693114b343ab74240187699c3802cfc6efa05b3e9f9bfec80fd2537799aa3ae050717bb1f6aab435996 +EBUILD xdp-tools-1.4.0.ebuild 2015 BLAKE2B 76c9ad09ca28716601086b670346d2325f22913cfc216bdc23e34b1a72670e936b757e23954a8b3195697c584054100e70965dbf9f5efcf91cd790d485d79b19 SHA512 934a9be5bd6846c1f143f0dc2b9dcf7de34a96f4751d004ecf7ecd4a485361f65bae153c04cb212ceffbfe5ba137712874bfd8f33e1b28d41aa6208c5b4a331d +EBUILD xdp-tools-1.4.1.ebuild 1979 BLAKE2B c34afc8b4fedffdc13f73f42291916a644fcf02107c9d21fad8a3e6d566561e1d1fd8cc4bb437bd6d26e1ed579d743e47b5c02c3115d30c6a1b56c5747578cc3 SHA512 5fc6d6adcd5bbb02692a006d0571706bec5e2befa4b029700329c97ee5b751bdd802d0e24993bbc5131cd74139390ef3858ddcaaa15ab7cb74c02003ff770d08 MISC metadata.xml 731 BLAKE2B a9c958d31f9ece376e4518e213823c14474df47747205020b76da7a0a67f7ed926ec55002b586143ce84cb965a23ad1794a42862597278682ef3605fc7d07911 SHA512 78774e4bcc6e05d56fe82b0aacd46e4d23e3bd89aa5bb55900adb94648d06b3251c575d4d0b6108cdad0f2ffbabcc2973e50e804b120a73e8923cd679601384f diff --git a/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch b/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch deleted file mode 100644 index 3a37b26efa14..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch +++ /dev/null @@ -1,32 +0,0 @@ - -From: https://github.com/xdp-project/xdp-tools/commit/cb6d06219d1b49b07980b481a383e1dea74a0702 -Bug: https://bugs.gentoo.org/889842 - -From cb6d06219d1b49b07980b481a383e1dea74a0702 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= -Date: Sat, 4 Mar 2023 20:08:25 +0100 -Subject: [PATCH] make: disable stack protector for BPF bits built by clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The clang toolchain might have stack-protection enabled by default -(e.g. via platform configuration) and that won't work for BPF, -so unconfitionally disable it via -fno-stack-protector. - -Signed-off-by: Holger Hoffstätte ---- - lib/defines.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/defines.mk b/lib/defines.mk -index f134c43b..54b259f2 100644 ---- a/lib/defines.mk -+++ b/lib/defines.mk -@@ -1,5 +1,5 @@ - CFLAGS ?= -O2 -g --BPF_CFLAGS ?= -Wno-visibility -+BPF_CFLAGS ?= -Wno-visibility -fno-stack-protector - BPF_TARGET ?= bpf - - HAVE_FEATURES := diff --git a/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch b/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch deleted file mode 100644 index d805e1077c76..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch +++ /dev/null @@ -1,36 +0,0 @@ - -From https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3 - -From a7df567634af77381832a2212c5f5099b07734f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= -Date: Sat, 4 Mar 2023 20:07:39 +0100 -Subject: [PATCH] configure: Fix function detection for btf__type_cnt() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The configure check for btf__type_cnt() swapped two arguments in the -check_libbpf_function() call in the configure script, leading to the check -failing if LIBBPF_CFLAGS is non-empty. Make sure the arguments are in the -right order, and also pass a proper NULL parameter in the check instead of -a 0. - -Reported-by: Holger Hoffstätte -Signed-off-by: Toke Høiland-Jørgensen ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 016c5bbd..62c2f883 100755 ---- a/configure -+++ b/configure -@@ -272,7 +272,7 @@ check_libbpf_functions() - - check_libbpf_function "perf_buffer__consume" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "btf__load_from_kernel_by_id" "(0)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" -- check_libbpf_function "btf__type_cnt" "(0)" "$LIBBPF_CFLAGS" "" "$LIBBPF_LDLIBS" -+ check_libbpf_function "btf__type_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "bpf_object__next_map" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "bpf_object__next_program" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "bpf_program__insn_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" diff --git a/net-libs/xdp-tools/files/1.3.1-musl.patch b/net-libs/xdp-tools/files/1.3.1-musl.patch deleted file mode 100644 index e3238871b262..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/836708 -https://github.com/xdp-project/xdp-tools/pull/309 - -From c9956abbfbd238bd2eb98c67ea002bfce29063a4 Mon Sep 17 00:00:00 2001 -From: Stijn Tintel -Date: Wed, 29 Mar 2023 04:25:06 +0300 -Subject: [PATCH] libxdp: fix build on musl - -In musl, PATH_MAX is defined in limits.h. Include it in libxdp.c to fix -building systems using musl libc. - -libxdp.c: In function 'find_bpffs': -libxdp.c:406:33: error: 'PATH_MAX' undeclared (first use in this function) - 406 | static char bpf_wrk_dir[PATH_MAX]; - | ^~~~~~~~ - -Signed-off-by: Stijn Tintel ---- a/lib/libxdp/libxdp.c -+++ b/lib/libxdp/libxdp.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include /* ERR_PTR */ - #include - diff --git a/net-libs/xdp-tools/files/1.3.1-no-Werror.patch b/net-libs/xdp-tools/files/1.3.1-no-Werror.patch deleted file mode 100644 index fb086f5122b9..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-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.3.1-xdpdump-clang.patch b/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch deleted file mode 100644 index 3983c8c8f402..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch +++ /dev/null @@ -1,36 +0,0 @@ - -From: https://github.com/xdp-project/xdp-tools/commit/344b241da22a5358c714d6db1ea6f225f951dbdb - -From 344b241da22a5358c714d6db1ea6f225f951dbdb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= -Date: Wed, 8 Mar 2023 18:50:56 +0100 -Subject: [PATCH] xdpdump: fix build with clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building all of xdp-tools with clang, the xdp-dump build fails -due to 'classic' use of variable-length arrays and -Werror. -Disable the warning and leave a breadcrumb to the discussion. - -Fixes: #304 -Signed-off-by: Holger Hoffstätte ---- - xdp-dump/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xdp-dump/Makefile b/xdp-dump/Makefile -index 7ee1688e..a9ae0ae7 100644 ---- a/xdp-dump/Makefile -+++ b/xdp-dump/Makefile -@@ -4,6 +4,10 @@ XDP_TARGETS := xdpdump_bpf xdpdump_xdp - USER_TARGETS := xdpdump - TEST_FILE := tests/test-xdpdump.sh - -+# Disable warnings about VLAs not being at the end of a structure when building -+# with clang. The code is fine, but clang's complaint coupled with -Werror would -+# break the build. See https://github.com/xdp-project/xdp-tools/issues/304 -+CFLAGS += "-Wno-gnu-variable-sized-type-not-at-end" - LIB_DIR = ../lib - USER_LIBS = -lpcap - MAN_PAGE := xdpdump.8 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 new file mode 100644 index 000000000000..fb086f5122b9 --- /dev/null +++ b/net-libs/xdp-tools/files/1.4.0-no-Werror.patch @@ -0,0 +1,75 @@ + +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.1-no-Werror.patch b/net-libs/xdp-tools/files/1.4.1-no-Werror.patch new file mode 100644 index 000000000000..52c50261f5d8 --- /dev/null +++ b/net-libs/xdp-tools/files/1.4.1-no-Werror.patch @@ -0,0 +1,75 @@ + +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) $(ARCH_INCLUDES) ++CFLAGS += -std=gnu11 -Wextra $(DEFINES) $(ARCH_INCLUDES) + BPF_CFLAGS += $(DEFINES) $(filter -ffile-prefix-map=%,$(CFLAGS)) $(ARCH_INCLUDES) + + 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/xdp-tools-1.2.8.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild deleted file mode 100644 index e881553d3eed..000000000000 --- a/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="The libxdp library and various tools for use with XDP" -HOMEPAGE="https://github.com/xdp-project/xdp-tools" -SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -IUSE="+tools" - -DEPEND="dev-libs/libbpf:= - sys-libs/zlib - net-libs/libpcap - virtual/libelf" -RDEPEND="${DEPEND}" -BDEPEND=">=sys-devel/clang-10.0.0" - -# Not prebuilt -- we build them -- but they're not ordinary ELF objects either. -QA_PREBUILT="usr/lib/bpf/*.o" - -MAKEOPTS+=" V=1" - -src_configure() { - export PRODUCTION=1 - export DYNAMIC_LIBXDP=1 - export FORCE_SYSTEM_LIBBPF=1 - default -} - -src_install() { - export PREFIX="${EPREFIX}/usr" - export LIBDIR="${PREFIX}/$(get_libdir)" - export BPF_OBJECT_DIR="${PREFIX}/lib/bpf" - default - - # To remove the scripts/testing files that are installed. - rm -r "${ED}/usr/share/xdp-tools" || die - # We can't control static archive generation yet. - rm "${ED}/usr/$(get_libdir)/libxdp.a" || die - - use tools || { rm "${ED}/usr/sbin"/* || die; } - - # These are ELF objects but BPF ones. - dostrip -x /usr/lib/bpf -} - -src_test() { :; } diff --git a/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild b/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild deleted file mode 100644 index 543536b75ae6..000000000000 --- a/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="The libxdp library and various tools for use with XDP" -HOMEPAGE="https://github.com/xdp-project/xdp-tools" -SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="+tools" - -DEPEND=" - dev-libs/libbpf:= - dev-util/bpftool - net-libs/libpcap - sys-libs/zlib - virtual/libelf -" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-apps/grep[pcre] - >=sys-devel/clang-11.0.0 -" - -# Not prebuilt -- we build them -- but they're not ordinary ELF objects either. -QA_PREBUILT="usr/lib/bpf/*.o" - -MAKEOPTS+=" V=1" - -PATCHES=( - "${FILESDIR}"/1.3.1-disable-stack-protector.patch - "${FILESDIR}"/1.3.1-fix-btf__type_cnt-detection.patch - "${FILESDIR}"/1.3.1-no-Werror.patch - "${FILESDIR}"/1.3.1-xdpdump-clang.patch - "${FILESDIR}"/1.3.1-musl.patch -) - -src_configure() { - export PREFIX="${EPREFIX}/usr" - export LIBDIR="${PREFIX}/$(get_libdir)" - export BPF_OBJECT_DIR="${PREFIX}/lib/bpf" - export PRODUCTION=1 - export DYNAMIC_LIBXDP=1 - export FORCE_SYSTEM_LIBBPF=1 - - # bug 861587 - filter-lto - - default -} - -src_test() { :; } - -src_install() { - default - - # To remove the scripts/testing files that are installed. - rm -r "${ED}/usr/share/xdp-tools" || die - # We can't control static archive generation yet. - rm "${ED}/usr/$(get_libdir)/libxdp.a" || die - - use tools || { rm "${ED}/usr/sbin"/* || die; } - - # These are ELF objects but BPF ones. - dostrip -x /usr/lib/bpf -} - -pkg_postinst() { - elog - elog "Many BPF utilities need access to a mounted bpffs virtual file system." - elog "Either mount it manually like this:" - elog - elog " mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700" - elog - elog "or add the following line to your /etc/fstab to always mount it at boot time:" - elog - elog " bpffs /sys/fs/bpf bpf nosuid,nodev,noexec,relatime,mode=700 0 0" - elog - elog "You can verify that bpffs is mounted with:" - elog - elog " mount | grep /sys/fs/bpf" - elog -} diff --git a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild index 1e5a994e83ad..400e2aa0f19e 100644 --- a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild +++ b/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild @@ -33,8 +33,8 @@ QA_PREBUILT="usr/lib/bpf/*.o" MAKEOPTS+=" V=1" PATCHES=( - "${FILESDIR}"/1.3.1-no-Werror.patch - "${FILESDIR}"/${PV}-toolchain.patch + "${FILESDIR}"/1.4.0-no-Werror.patch + "${FILESDIR}"/1.4.0-toolchain.patch ) src_configure() { diff --git a/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild new file mode 100644 index 000000000000..53974f63d493 --- /dev/null +++ b/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="The libxdp library and various tools for use with XDP" +HOMEPAGE="https://github.com/xdp-project/xdp-tools" +SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1 BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="+tools" + +DEPEND=" + dev-libs/libbpf:= + dev-util/bpftool + net-libs/libpcap + sys-libs/zlib + virtual/libelf +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/grep[pcre] + >=sys-devel/clang-11.0.0 +" + +# Not prebuilt -- we build them -- but they're not ordinary ELF objects either. +QA_PREBUILT="usr/lib/bpf/*.o" + +MAKEOPTS+=" V=1" + +PATCHES=( + "${FILESDIR}"/1.4.1-no-Werror.patch +) + +src_configure() { + export CC="$(tc-getCC)" + export LD="$(tc-getLD)" + export PREFIX="${EPREFIX}/usr" + export LIBDIR="${PREFIX}/$(get_libdir)" + export BPF_OBJECT_DIR="${PREFIX}/lib/bpf" + export PRODUCTION=1 + export DYNAMIC_LIBXDP=1 + export FORCE_SYSTEM_LIBBPF=1 + + # bug 861587 + filter-lto + + default +} + +src_test() { :; } + +src_install() { + default + + # To remove the scripts/testing files that are installed. + rm -r "${ED}/usr/share/xdp-tools" || die + # We can't control static archive generation yet. + rm "${ED}/usr/$(get_libdir)/libxdp.a" || die + + use tools || { rm "${ED}/usr/sbin"/* || die; } + + # These are ELF objects but BPF ones. + dostrip -x /usr/lib/bpf +} + +pkg_postinst() { + elog + elog "Many BPF utilities need access to a mounted bpffs virtual file system." + elog "Either mount it manually like this:" + elog + elog " mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700" + elog + elog "or add the following line to your /etc/fstab to always mount it at boot time:" + elog + elog " bpffs /sys/fs/bpf bpf nosuid,nodev,noexec,relatime,mode=700 0 0" + elog + elog "You can verify that bpffs is mounted with:" + elog + elog " mount | grep /sys/fs/bpf" + elog +} -- cgit v1.2.3