Fix xdp-tools submodule to work with libbpf submodule

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 <toke@redhat.com>
This commit is contained in:
Toke Høiland-Jørgensen
2022-04-26 22:03:08 +02:00
parent 6b10ae1c6e
commit c2eb81ec70
2 changed files with 4 additions and 2 deletions

4
configure vendored
View File

@@ -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"