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 c598745..d7602b7 100644 (file)
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -10,8 +10,8 @@ endif
 
 static_ibverbs = (get_option('ibverbs_link') == 'static')
 dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
-LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
-LIB_GLUE_VERSION = '18.02.0'
+LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
+LIB_GLUE_VERSION = abi_version
 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
-       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
@@ -50,7 +51,6 @@ if static_ibverbs
        ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
-allow_experimental_apis = true
 sources = files(
        'mlx4.c',
        'mlx4_ethdev.c',
@@ -117,7 +117,7 @@ configure_file(output : 'mlx4_autoconf.h', configuration : config)
 # Build Glue Library
 if dlopen_ibverbs
        dlopen_name = 'mlx4_glue'
-       dlopen_lib_name = driver_name_fmt.format(dlopen_name)
+       dlopen_lib_name = 'rte_net_' + dlopen_name
        dlopen_so_version = LIB_GLUE_VERSION
        dlopen_sources = files('mlx4_glue.c')
        dlopen_install_dir = [ eal_pmd_path + '-glue' ]