Linking with libbpf v0.8.0 causes deprication warnings. As a temporary
measure, prevent linking with libbpf versions v0.8.0 and greater. This
limitation should be removed in the future when appropriate
compatibility measures are introduced.
Signed-off-by: Ciara Loftus <ciara.lof...@intel.com>
---
doc/guides/nics/af_xdp.rst | 3 ++-
drivers/net/af_xdp/meson.build | 7 ++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/doc/guides/nics/af_xdp.rst b/doc/guides/nics/af_xdp.rst
index 56681c8365..46738e089d 100644
--- a/doc/guides/nics/af_xdp.rst
+++ b/doc/guides/nics/af_xdp.rst
@@ -43,7 +43,8 @@ Prerequisites
This is a Linux-specific PMD, thus the following prerequisites apply:
* A Linux Kernel (version > v4.18) with XDP sockets configuration enabled;
-* Both libxdp >=v1.2.2 and libbpf libraries installed, or, libbpf <=v0.6.0
+* Both libxdp >=v1.2.2 and libbpf <=v0.7.0 libraries installed, or, libbpf
+ <=v0.6.0.
* If using libxdp, it requires an environment variable called
LIBXDP_OBJECT_PATH to be set to the location of where libxdp placed its bpf
object files. This is usually in /usr/local/lib/bpf or /usr/local/lib64/bpf.
diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index 1e0de23705..52862e90a1 100644
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -10,10 +10,7 @@ endif
sources = files('rte_eth_af_xdp.c')
xdp_dep = dependency('libxdp', version : '>=1.2.2', required: false, method:
'pkg-config')
-bpf_dep = dependency('libbpf', required: false, method: 'pkg-config')
-if not bpf_dep.found()
- bpf_dep = cc.find_library('bpf', required: false)
-endif
+bpf_dep = dependency('libbpf', version : '<=0.7.0', required: false, method:
'pkg-config')
if cc.has_header('linux/if_xdp.h')
if xdp_dep.found() and cc.has_header('xdp/xsk.h')
@@ -29,7 +26,7 @@ if cc.has_header('linux/if_xdp.h')
endif
else
build = false
- reason = 'missing dependency, libbpf'
+ reason = 'missing dependency, libbpf <= v0.7.0'
endif
elif bpf_dep.found() and cc.has_header('bpf/xsk.h') and
cc.has_header('bpf/bpf.h')
# libxdp not found. Rely solely on libbpf for xsk functionality
--
2.25.1
