net-libs/xdp-tools: Use sed instead of patch for -Werror

Less fragile & easier to maintain.

Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Holger Hoffstätte
2023-11-22 12:02:13 +00:00
committed by Sam James
parent 61a2e82219
commit 08af5d6c5e
2 changed files with 9 additions and 76 deletions
@@ -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) $(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}
+9 -1
View File
@@ -33,9 +33,17 @@ QA_PREBUILT="usr/lib/bpf/*.o"
MAKEOPTS+=" V=1"
PATCHES=(
"${FILESDIR}"/1.4.1-no-Werror.patch
)
src_prepare() {
# remove -Werror: #899744
sed -i 's/-Werror//g' lib/Makefile lib/defines.mk
sed -i '/-Werror/d' lib/common.mk lib/libxdp/Makefile \
lib/libxdp/tests/Makefile lib/util/Makefile
default
}
src_configure() {
export CC="$(tc-getCC)"
export LD="$(tc-getLD)"