48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From f76dc44dedeead72c785ad911946818065a9f389 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
|
|
Date: Thu, 6 Oct 2022 09:26:50 +0300
|
|
Subject: [PATCH] net/af_xdp: make clear which libxdp version is required
|
|
|
|
[ upstream commit f76dc44dedeead72c785ad911946818065a9f389 ]
|
|
|
|
|
|
Include checked libxdp version in driver build skip reason.
|
|
|
|
Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
|
|
Reviewed-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
|
|
---
|
|
drivers/net/af_xdp/meson.build | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
|
|
index 882d0b9518..fa011c357d 100644
|
|
--- a/drivers/net/af_xdp/meson.build
|
|
+++ b/drivers/net/af_xdp/meson.build
|
|
@@ -9,7 +9,8 @@ endif
|
|
|
|
sources = files('rte_eth_af_xdp.c')
|
|
|
|
-xdp_dep = dependency('libxdp', version : '>=1.2.2', required: false, method: 'pkg-config')
|
|
+libxdp_ver = '>=1.2.2'
|
|
+xdp_dep = dependency('libxdp', version : libxdp_ver, 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)
|
|
@@ -45,11 +46,11 @@ if cc.has_header('linux/if_xdp.h')
|
|
endif
|
|
else
|
|
build = false
|
|
- reason = 'missing dependency, "libxdp" or "libbpf <= v0.6.0"'
|
|
+ reason = 'missing dependency, "libxdp ' + libxdp_ver + '" or "libbpf <= v0.6.0"'
|
|
endif
|
|
else
|
|
build = false
|
|
- reason = 'missing dependency, "libxdp" and "libbpf"'
|
|
+ reason = 'missing dependency, "libxdp ' + libxdp_ver + '" and "libbpf"'
|
|
endif
|
|
else
|
|
build = false
|
|
--
|
|
2.33.0
|
|
|