mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-libs/xdp-tools: bump to 1.2.8
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
This commit is contained in:
@@ -1 +1 @@
|
||||
DIST xdp-tools-1.2.3.tar.gz 252515 BLAKE2B 26c1bfd5b6c3457794801db64d020b8d6eb254661a0a44fa89dde6a1ff7c04dec1207d38a755029c8caaa955cabec70f196e37257f337cf484b8e3525261119e SHA512 588cda7010592f34ac600993ea528b76be4a8786c1b4e4599c92c5683a80848a11ae90db825f56b67adec60bd8c684bb4ced21dc1bc1b750cbd5d0704d67390d
|
||||
DIST xdp-tools-1.2.8.tar.gz 253786 BLAKE2B f745085b73da5193c3cdaf60c20dfa5de62f3d83487413c87b4c3d07b755dcf91cfbeb4ba970b4e04eef74b4cec4238057f4462074f49b7139d7652cb0f22998 SHA512 6ada9e433fcbefd13cebdffe93c3ce9159e9e09f1498d1615918ca6ecc4f11f03fcd9096980e8ceb7de126d4d8b953fa64917e777d54b5a3dfd1a9556de81626
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
https://bugs.gentoo.org/831339
|
||||
https://bugs.gentoo.org/846938
|
||||
--- 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
|
||||
--- a/lib/common.mk
|
||||
+++ b/lib/common.mk
|
||||
@@ -113,7 +113,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}
|
||||
|
||||
--- a/lib/defines.mk
|
||||
+++ b/lib/defines.mk
|
||||
@@ -39,7 +39,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)
|
||||
|
||||
CONFIGMK := $(LIB_DIR)/../config.mk
|
||||
--- a/lib/libxdp/Makefile
|
||||
+++ b/lib/libxdp/Makefile
|
||||
@@ -19,7 +19,7 @@ MAN_OBJ := ${MAN_PAGE:.3=.man}
|
||||
MAN_FILES := $(MAN_PAGE)
|
||||
TEST_DIR := tests
|
||||
TEST_FILE := $(TEST_DIR)/test-libxdp.sh
|
||||
-TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall -Werror $(LDFLAGS)
|
||||
+TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall $(LDFLAGS)
|
||||
TEST_LDLIBS := $(LDLIBS)
|
||||
|
||||
SHARED_CFLAGS += -fPIC -DSHARED
|
||||
@@ -144,7 +144,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/configure b/configure
|
||||
index 0a17eae..fd251b7 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -186,7 +186,7 @@ int main(int argc, char **argv) {
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
- libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
|
||||
+ libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo "HAVE_FEATURES+=${config_var}" >>"$CONFIG"
|
||||
echo "yes"
|
||||
@@ -254,7 +254,7 @@ int main(int argc, char **argv) {
|
||||
}
|
||||
EOF
|
||||
|
||||
- libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
|
||||
+ libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo "SYSTEM_LIBBPF:=y" >>$CONFIG
|
||||
echo "LIBBPF_VERSION=$LIBBPF_VERSION" >>$CONFIG
|
||||
@@ -25,10 +25,6 @@ QA_PREBUILT="usr/lib/bpf/*.o"
|
||||
|
||||
MAKEOPTS+=" V=1"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.2.3-no-werror.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
export PRODUCTION=1
|
||||
export DYNAMIC_LIBXDP=1
|
||||
Reference in New Issue
Block a user