From: Tonghao Zhang <xiangxia.m....@gmail.com>
When setting the CONFIG_RTE_BUILD_SHARED_LIB to y,
and build the mlx5 pmd, there is a building error.
To fix it, add RTE_IBVERBS_LINK_DLOPEN to include
relative codes.
mlx5_common.o: In function `mlx5_glue_init':
drivers/common/mlx5/mlx5_common.c:324: undefined reference to `dlclose'
Fixes: 7b4f1e6bd367 ("common/mlx5: introduce common library")
Cc: sta...@dpdk.org
Signed-off-by: Tonghao Zhang <xiangxia.m....@gmail.com>
Tested-by: Ali Alnubani <alia...@mellanox.com>
---
v3:
* rename the patch title
* mv the dlfcn.h to define area
* tested:
https://travis-ci.com/ovn-open-virtual-networks/dpdk-next-net/builds/151882661
v2:
* change the patch title
---
drivers/common/mlx5/mlx5_common.c | 10 +++++++---
drivers/net/mlx4/mlx4.c | 4 +++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index 610fb48..9ea56f2 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -2,10 +2,12 @@
* Copyright 2019 Mellanox Technologies, Ltd
*/
-#include <dlfcn.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#ifdef RTE_IBVERBS_LINK_DLOPEN
+#include <dlfcn.h>
+#endif
#include <rte_errno.h>
@@ -209,8 +211,6 @@ enum mlx5_class
*/
RTE_INIT_PRIO(mlx5_glue_init, CLASS)
{
- void *handle = NULL;
-
/* Initialize common log type. */
mlx5_common_logtype = rte_log_register("pmd.common.mlx5");
if (mlx5_common_logtype >= 0)
@@ -233,6 +233,8 @@ enum mlx5_class
/* The glue initialization was done earlier by mlx5 common library. */
#ifdef RTE_IBVERBS_LINK_DLOPEN
char glue_path[sizeof(RTE_EAL_PMD_PATH) - 1 + sizeof("-glue")];
+ void *handle = NULL;
+
const char *path[] = {
/*
* A basic security check is necessary before trusting
@@ -320,8 +322,10 @@ enum mlx5_class
mlx5_glue->fork_init();
return;
glue_error:
+#ifdef RTE_IBVERBS_LINK_DLOPEN
if (handle)
dlclose(handle);
+#endif
DRV_LOG(WARNING, "Cannot initialize MLX5 common due to missing"
" run-time dependency on rdma-core libraries (libibverbs,"
" libmlx5)");
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index a1dd658..8e29878 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -8,7 +8,6 @@
* mlx4 driver initialization.
*/
-#include <dlfcn.h>
#include <errno.h>
#include <inttypes.h>
#include <stddef.h>
@@ -18,6 +17,9 @@
#include <string.h>
#include <sys/mman.h>
#include <unistd.h>
+#ifdef RTE_IBVERBS_LINK_DLOPEN
+#include <dlfcn.h>
+#endif
/* Verbs headers do not support -pedantic. */
#ifdef PEDANTIC
--
1.8.3.1
