From c2eb81ec70e63ac31169d3967bf7e325bf35fe3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Tue, 26 Apr 2022 22:03:08 +0200 Subject: [PATCH] Fix xdp-tools submodule to work with libbpf submodule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the version of xdp-tools to pull in some configure changes that makes interoperating between a libbpf submodule and an xdp-tools submodule work better, and set the LIBBPF_UNBUILT variable in the top-level configure to enables this support. Signed-off-by: Toke Høiland-Jørgensen --- configure | 4 +++- lib/xdp-tools | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b133c79..faf1799 100755 --- a/configure +++ b/configure @@ -192,7 +192,9 @@ check_libxdp() echo "SYSTEM_LIBXDP:=n" >> $CONFIG if [ "$SUBMODULE_LIBBPF" -eq "1" ]; then echo "Configuring libxdp to use our libbpf submodule" - (export LIBBPF_DIR="$(readlink -m lib/libbpf)" LIBBPF_INCLUDE_DIR="$(readlink -m lib/install/include)"; + (export LIBBPF_DIR="$(readlink -m lib/libbpf)" \ + LIBBPF_INCLUDE_DIR="$(readlink -m lib/install/include)" \ + LIBBPF_UNBUILT=1; cd lib/xdp-tools; ./configure) else echo "Configuring libxdp without our libbpf" diff --git a/lib/xdp-tools b/lib/xdp-tools index 8858c81..fe029c7 160000 --- a/lib/xdp-tools +++ b/lib/xdp-tools @@ -1 +1 @@ -Subproject commit 8858c814d039340f1789a12412e995da5d7e909c +Subproject commit fe029c770733930a92014687d386c0b34ba13627