git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/mlx5: fix using flow tunnel before null check
[dpdk.git]
/
drivers
/
net
/
mlx4
/
meson.build
diff --git
a/drivers/net/mlx4/meson.build
b/drivers/net/mlx4/meson.build
index
c22a888
..
d7602b7
100644
(file)
--- a/
drivers/net/mlx4/meson.build
+++ b/
drivers/net/mlx4/meson.build
@@
-11,7
+11,7
@@
endif
static_ibverbs = (get_option('ibverbs_link') == 'static')
dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
static_ibverbs = (get_option('ibverbs_link') == 'static')
dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
-LIB_GLUE_VERSION =
'18.02.0'
+LIB_GLUE_VERSION =
abi_version
LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
if dlopen_ibverbs
dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
if dlopen_ibverbs
dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
@@
-24,7
+24,8
@@
endif
libnames = [ 'mlx4', 'ibverbs' ]
libs = []
foreach libname:libnames
libnames = [ 'mlx4', 'ibverbs' ]
libs = []
foreach libname:libnames
- lib = dependency('lib' + libname, static:static_ibverbs, required:false)
+ lib = dependency('lib' + libname, static:static_ibverbs,
+ required:false, method: 'pkg-config')
if not lib.found() and not static_ibverbs
lib = cc.find_library(libname, required:false)
endif
if not lib.found() and not static_ibverbs
lib = cc.find_library(libname, required:false)
endif