On Wed, Jan 09, 2019 at 03:05:23AM +0100, Thomas Monjalon wrote:
> Rename options CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS and
> CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS to a single option
> CONFIG_RTE_IBVERBS_LINK_DLOPEN.
> Rename meson option enable_driver_mlx_glue to ibverbs_link.
>
> There was no good reason for setting a different link option
> for mlx4 and mlx5. Having a single common option makes it
> easier to understand and unify make and meson systems.
>
> Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
> ---
> config/common_base | 7 +++++--
> doc/guides/nics/mlx4.rst | 4 ++--
> doc/guides/nics/mlx5.rst | 4 ++--
> drivers/net/mlx4/Makefile | 8 ++++----
> drivers/net/mlx4/meson.build | 4 ++--
> drivers/net/mlx4/mlx4.c | 4 ++--
> drivers/net/mlx5/Makefile | 8 ++++----
> drivers/net/mlx5/meson.build | 4 ++--
> drivers/net/mlx5/mlx5.c | 4 ++--
> meson_options.txt | 4 ++--
> mk/rte.app.mk | 15 +++++++--------
> 11 files changed, 34 insertions(+), 32 deletions(-)
>
<snip>
> diff --git a/meson_options.txt b/meson_options.txt
> index 10b541615..fab97591a 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -2,8 +2,8 @@ option('allow_invalid_socket_id', type: 'boolean', value:
> false,
> description: 'allow out-of-range NUMA socket id\'s for platforms that
> don\'t report the value correctly')
> option('drivers_install_subdir', type: 'string', value:
> 'dpdk/pmds-<VERSION>',
> description: 'Subdirectory of libdir where to install PMDs. Defaults to
> using a versioned subdirectory.')
> -option('enable_driver_mlx_glue', type: 'boolean', value: false,
> - description: 'Enable glue library for Mellanox PMDs')
> +option('ibverbs_link', type: 'string', value: 'shared',
> + description: 'Linkage method (shared/dlopen) for Mellanox PMDs with
> ibverbs dependencies.')
I think it's better to use the "combo" option type here rather than
a generic string. That way we get proper protection against typos when
configuring.
[Ref: https://mesonbuild.com/Build-options.html]
