ring: remove unnecessary forward declaration

[dpdk.git] / drivers / net / mlx4 / meson.build

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 7de571e..2540489 100644 (file)
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -2,25 +2,28 @@
 # Copyright 2018 6WIND S.A.
 # Copyright 2018 Mellanox Technologies, Ltd
 
-pmd_dlopen = get_option('enable_driver_mlx_glue')
+pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
 LIB_GLUE_VERSION = '18.02.0'
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if pmd_dlopen
-       dpdk_conf.set('RTE_LIBRTE_MLX4_DLOPEN_DEPS', 1)
+       dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
        cflags += [
                '-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
                '-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
        ]
 endif
-libs = [
-       cc.find_library('mnl', required:false),
-       cc.find_library('mlx4', required:false),
-       cc.find_library('ibverbs', 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
@@ -33,6 +36,7 @@ if build
                'mlx4_ethdev.c',
                'mlx4_flow.c',
                'mlx4_intr.c',
+               'mlx4_mp.c',
                'mlx4_mr.c',
                'mlx4_rxq.c',
                'mlx4_rxtx.c',
@@ -70,7 +74,19 @@ if build
                [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
                'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
        ]
+       # input array for meson symbol search:
+       # [ "MACRO to define if found", "header for the search",
+       #   "symbol to search" ]
+       has_sym_args = [
+               [ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
+               'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
+               [ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
+               'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
+       ]
        config = configuration_data()
+       foreach arg:has_sym_args
+               config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
+       endforeach
        foreach arg:has_member_args
                file_prefix = '#include<' + arg[1] + '>'
                config.set(arg[0], cc.has_member(arg[2], arg[3],