[openwrt/openwrt] xdp-tools: fix compilation when bpftool is installed

LEDE Commits lede-commits at lists.infradead.org
Mon Oct 28 02:34:53 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/ff18576f845e9b422748efcafe1332e206626604

commit ff18576f845e9b422748efcafe1332e206626604
Author: Til Kaiser <mail at tk154.de>
AuthorDate: Sun Oct 27 14:02:14 2024 +0100

    xdp-tools: fix compilation when bpftool is installed
    
    Currently, xdp-tools doesn't compile on build systems where
    bpftool is installed because additional tools and BPF programs
    will be compiled then, which results in build errors.
    
    This commit disables the compilation of those bpftool-dependent tools.
    
    Signed-off-by: Til Kaiser <mail at tk154.de>
    Link: https://github.com/openwrt/openwrt/pull/16787
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/network/utils/xdp-tools/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/network/utils/xdp-tools/Makefile b/package/network/utils/xdp-tools/Makefile
index 8c4071991f..8bce10f634 100644
--- a/package/network/utils/xdp-tools/Makefile
+++ b/package/network/utils/xdp-tools/Makefile
@@ -87,7 +87,8 @@ CONFIGURE_VARS += \
 	CLANG="$(CLANG)" \
 	BPF_TARGET="$(BPF_ARCH)-linux-gnu" \
 	LLC="$(LLVM_LLC)" \
-	BPF_LDFLAGS="-march=$(BPF_TARGET) -mcpu=v3"
+	BPF_LDFLAGS="-march=$(BPF_TARGET) -mcpu=v3" \
+	BPFTOOL=""
 
 ifneq ($(findstring s,$(OPENWRT_VERBOSE)),)
 	MAKE_FLAGS+=V=1




More information about the lede-commits mailing list