From af21b4425972aa4a00a0321be780ba556b13b980 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 19 Oct 2020 11:41:51 +0200 Subject: [PATCH] net/mlx: remove separate ABI version for glue libraries The glue libraries are tightly bound to the mlx drivers of a dpdk version and are packaged with them. Keeping a separate ABI version prevents us from installing two versions of dpdk. Maintaining this separate version just adds confusion. Align the glue library ABI version to the global ABI version. Signed-off-by: David Marchand Acked-by: Thomas Monjalon Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/linux/meson.build | 2 +- drivers/common/mlx5/linux/mlx5_glue.h | 1 - drivers/net/mlx4/meson.build | 2 +- drivers/net/mlx4/mlx4_glue.h | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build index 0d437f8fb0..32be198223 100644 --- a/drivers/common/mlx5/linux/meson.build +++ b/drivers/common/mlx5/linux/meson.build @@ -6,7 +6,7 @@ includes += include_directories('.') static_ibverbs = (get_option('ibverbs_link') == 'static') dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_common_mlx5_glue.so' -LIB_GLUE_VERSION = '20.02.0' +LIB_GLUE_VERSION = abi_version LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) diff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h index a5e7fb3862..0bb9a6d483 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.h +++ b/drivers/common/mlx5/linux/mlx5_glue.h @@ -131,7 +131,6 @@ struct mlx5dv_var { uint32_t page_id; uint32_t length; off_t mmap_off; #define IBV_ACCESS_RELAXED_ORDERING 0 #endif -/* LIB_GLUE_VERSION must be updated every time this structure is modified. */ struct mlx5_glue { const char *version; int (*fork_init)(void); diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index c22a88875f..0cf9938a88 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -11,7 +11,7 @@ endif static_ibverbs = (get_option('ibverbs_link') == 'static') dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_net_mlx4_glue.so' -LIB_GLUE_VERSION = '18.02.0' +LIB_GLUE_VERSION = abi_version LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) diff --git a/drivers/net/mlx4/mlx4_glue.h b/drivers/net/mlx4/mlx4_glue.h index 5d9e985495..96d5cb16b4 100644 --- a/drivers/net/mlx4/mlx4_glue.h +++ b/drivers/net/mlx4/mlx4_glue.h @@ -23,7 +23,6 @@ #define MLX4_GLUE_VERSION "" #endif -/* LIB_GLUE_VERSION must be updated every time this structure is modified. */ struct mlx4_glue { const char *version; int (*fork_init)(void);