On Fri, Apr 12, 2019 at 04:24:48PM -0700, Yongseok Koh wrote:
> 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: e30b4e566f47 ("build: improve dependency handling")
> Cc: [email protected]
> Cc: [email protected]
>
> Signed-off-by: Yongseok Koh <[email protected]>
> ---
> drivers/net/mlx4/meson.build | 19 +++++++++++--------
> drivers/net/mlx5/meson.build | 19 +++++++++++--------
> 2 files changed, 22 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
> index de020701d1..9082f69f25 100644
> --- a/drivers/net/mlx4/meson.build
> +++ b/drivers/net/mlx4/meson.build
> @@ -13,21 +13,24 @@ 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),
> -]
> +libs = [ 'libmnl', 'libmlx4', 'libibverbs' ]
> +lib_deps = []
Minor suggestion - you can reduce the size of the diff in this patch by
defining the first array as "libnames" and keeping the actual dependency
objects as "libs".
/Bruce
