DPDK 18.11 uses libverbs and libmlx4 when MLX4 PMD is enabled. This commit makes OVS to link to libverbs and libmlx4 when MLX4 PMD is enabled on DPDK.
Signed-off-by: Eli Britstein <el...@mellanox.com> Reviewed-by: Asaf Penso <as...@mellanox.com> --- acinclude.m4 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 851cc6018..ba31aacfc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -313,18 +313,34 @@ AC_DEFUN([OVS_CHECK_DPDK], [ DPDK_EXTRA_LIB="-lmlx5" AC_DEFINE([DPDK_MLX5], [1], [MLX5 PMD detected in DPDK.])]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [ + #include <rte_config.h> +#if defined(RTE_LIBRTE_MLX4_PMD) && !defined(RTE_LIBRTE_MLX4_DLOPEN_DEPS) +#error +#endif + ], []) + ], [], + [AC_SEARCH_LIBS([mlx4dv_init_obj],[mlx4],[],[AC_MSG_ERROR([unable to find libmlx4, install the dependency package])]) + DPDK_EXTRA_LIB="-lmlx4" + AC_DEFINE([DPDK_MLX4], [1], [MLX4 PMD detected in DPDK.])]) + AC_COMPILE_IFELSE([ AC_LANG_PROGRAM( [ #include <rte_config.h> #if defined(RTE_LIBRTE_MLX5_PMD) && !defined(RTE_LIBRTE_MLX5_DLOPEN_DEPS) #error +#endif +#if defined(RTE_LIBRTE_MLX4_PMD) && !defined(RTE_LIBRTE_MLX4_DLOPEN_DEPS) +#error #endif ], []) ], [], [AC_SEARCH_LIBS([verbs_init_cq],[ibverbs],[],[AC_MSG_ERROR([unable to find libibverbs, install the dependency package])]) DPDK_EXTRA_LIB="-libverbs" - AC_DEFINE([DPDK_VERBS], [1], [MLX5 PMD detected in DPDK.])]) + AC_DEFINE([DPDK_VERBS], [1], [MLX4/5 PMD detected in DPDK.])]) # On some systems we have to add -ldl to link with dpdk # -- 2.14.5 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev