Przeglądaj źródła

xdp-tools: don't rely on host bpf headers

xdp-tools build currently breaks on build hosts which do not have
libbpf headers installed because the build system wrongly tries to
use the host's include path.
Properly pass path to libbpf headers to xdp-tools build system to
fix build e.g. on the buildbots.

Signed-off-by: Daniel Golle <[email protected]>
Daniel Golle 3 lat temu
rodzic
commit
f5d6ed3007
1 zmienionych plików z 5 dodań i 1 usunięć
  1. 5 1
      package/network/utils/xdp-tools/Makefile

+ 5 - 1
package/network/utils/xdp-tools/Makefile

@@ -85,7 +85,6 @@ CONFIGURE_VARS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	CLANG="$(CLANG)" \
-	BPF_CFLAGS="$(BPF_CFLAGS)" \
 	BPF_TARGET="$(BPF_TARGET)" \
 	LLC="$(LLVM_LLC)"
 
@@ -93,6 +92,11 @@ MAKE_VARS += \
 	PREFIX=/usr \
 	RUNDIR=/tmp/run
 
+define Build/Configure
+	$(call Build/Configure/Default)
+	echo "BPF_CFLAGS += -I$(BPF_HEADERS_DIR)/tools/lib" >> $(PKG_BUILD_DIR)/config.mk
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/xdp
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/xdp/*.h $(1)/usr/include/xdp/