drivers: remove duplicated compiler flags

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

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 7de571e..873edad 100644 (file)
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -2,29 +2,40 @@
 # Copyright 2018 6WIND S.A.
 # Copyright 2018 Mellanox Technologies, Ltd
 
-pmd_dlopen = get_option('enable_driver_mlx_glue')
+if not is_linux
+       build = false
+       reason = 'only supported on Linux'
+       subdir_done()
+endif
+build = true
+
+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),
-]
-build = true
-foreach lib:libs
+
+libnames = [ 'mnl', 'mlx4', 'ibverbs' ]
+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
+               reason = 'missing dependency, "' + libname + '"'
        endif
 endforeach
-# Compile PMD
+
 if build
        allow_experimental_apis = true
        ext_deps += libs
@@ -33,6 +44,7 @@ if build
                'mlx4_ethdev.c',
                'mlx4_flow.c',
                'mlx4_intr.c',
+               'mlx4_mp.c',
                'mlx4_mr.c',
                'mlx4_rxq.c',
                'mlx4_rxtx.c',
@@ -43,7 +55,6 @@ if build
                sources += files('mlx4_glue.c')
        endif
        cflags_options = [
-               '-Wextra',
                '-std=c11',
                '-Wno-strict-prototypes',
                '-D_BSD_SOURCE',
@@ -64,17 +75,30 @@ if build
        # mlx4_autoconf.h file is still generated.
        # input array for meson member search:
        # [ "MACRO to define if found", "header for the search",
-       #   "symbol to search","struct member to search" ]
+       #   "symbol to search", "struct member to search" ]
        #
        has_member_args = [
                [ '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],
+                       dependencies: libs))
+       endforeach
        foreach arg:has_member_args
-               file_prefix = '#include<' + arg[1] + '>'
+               file_prefix = '#include <' + arg[1] + '>'
                config.set(arg[0], cc.has_member(arg[2], arg[3],
-                       prefix : file_prefix))
+                       prefix: file_prefix, dependencies: libs))
        endforeach
        configure_file(output : 'mlx4_autoconf.h', configuration : config)
 endif