From 76c72a34bb0aa174fea2fa4978550603e154357f Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 12 Feb 2020 23:07:07 +0100 Subject: [PATCH 1/1] net/mlx: rename meson variable for dlopen option The name of the variable pmd_dlopen is confusing because it can be understood as true if the PMD is dlopen, whereas it means the ibverbs glue layer is a dlopen library. That's why it is renamed dlopen_ibverbs. Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson --- drivers/common/mlx5/meson.build | 8 ++++---- drivers/net/mlx4/meson.build | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index 089494e1f8..ea98e61fcd 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -8,11 +8,11 @@ if not is_linux endif static_ibverbs = (get_option('ibverbs_link') == 'static') -pmd_dlopen = (get_option('ibverbs_link') == 'dlopen') +dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so' LIB_GLUE_VERSION = '20.02.0' LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION -if pmd_dlopen +if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) cflags += [ '-DMLX5_GLUE="@0@"'.format(LIB_GLUE), @@ -54,7 +54,7 @@ sources = files( 'mlx5_common.c', 'mlx5_nl.c', ) -if not pmd_dlopen +if not dlopen_ibverbs sources += files('mlx5_glue.c') endif cflags_options = [ @@ -193,7 +193,7 @@ endforeach configure_file(output : 'mlx5_autoconf.h', configuration : config) # Build Glue Library -if pmd_dlopen +if dlopen_ibverbs dlopen_name = 'mlx5_glue' dlopen_lib_name = 'rte_pmd_@0@'.format(dlopen_name) dlopen_so_version = LIB_GLUE_VERSION diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index 290bd1e268..f66e70f4d1 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -9,11 +9,11 @@ if not is_linux endif static_ibverbs = (get_option('ibverbs_link') == 'static') -pmd_dlopen = (get_option('ibverbs_link') == 'dlopen') +dlopen_ibverbs = (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 +if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) cflags += [ '-DMLX4_GLUE="@0@"'.format(LIB_GLUE), @@ -61,7 +61,7 @@ sources = files( 'mlx4_txq.c', 'mlx4_utils.c', ) -if not pmd_dlopen +if not dlopen_ibverbs sources += files('mlx4_glue.c') endif cflags_options = [ @@ -113,7 +113,7 @@ endforeach configure_file(output : 'mlx4_autoconf.h', configuration : config) # Build Glue Library -if pmd_dlopen +if dlopen_ibverbs dlopen_name = 'mlx4_glue' dlopen_lib_name = driver_name_fmt.format(dlopen_name) dlopen_so_version = LIB_GLUE_VERSION -- 2.20.1