d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx: fix library search in meson build

Browse Source 
If MLNX_OFED is installed, there's no .pc file installed for libraries and
dependency() can't find libraries by pkg-config. By adding fallback of
using cc.find_library(), libraries are properly located.

Fixes: e30b4e566f ("build: improve dependency handling")
Cc: stable@dpdk.org

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Luca Boccassi <bluca@debian.org>
This commit is contained in:
Yongseok Koh 2019-04-18 04:49:02 -07:00 committed by Thomas Monjalon
parent 0559d091cc
commit d588f12ffb
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/mlx4/meson.build
View File

@ -13,14 +13,17 @@ if pmd_dlopen
'-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
]
endif
libs = [
dependency('libmnl', required:false),
dependency('libmlx4', required:false),
dependency('libibverbs', required:false),
]
libnames = [ 'mnl', 'mlx4', 'ibverbs' ]
libs = []
build = true
foreach lib:libs
foreach libname:libnames
lib = dependency('lib' + libname, required:false)
if not lib.found()
lib = cc.find_library(libname, required:false)
endif
if lib.found()
libs += [ lib ]
else
build = false
endif
endforeach

15
drivers/net/mlx5/meson.build
View File

@ -13,14 +13,17 @@ if pmd_dlopen
'-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
]
endif
libs = [
dependency('libmnl', required:false),
dependency('libmlx5', required:false),
dependency('libibverbs', required:false),
]
libnames = [ 'mnl', 'mlx5', 'ibverbs' ]
libs = []
build = true
foreach lib:libs
foreach libname:libnames
lib = dependency('lib' + libname, required:false)
if not lib.found()
lib = cc.find_library(libname, required:false)
endif
if lib.found()
libs += [ lib ]
else
build = false
endif
endforeach