From: Benoît Ganne <bganne@cisco.com>
Date: Tue, 6 Aug 2019 16:14:12 +0000 (+0200)
Subject: rdma: add missing symbols
X-Git-Tag: v20.01-rc0~1
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=c0bc26eaf33d4309ec9e38086366ea172b624806;p=vpp.git

rdma: add missing symbols

rdma-core-25.0 move some symbol to another library, make sure we link
to it.

Type: fix
Fixes: ec757593859bd8c16839ea8a81a2ef4eb8b29539

Change-Id: I6b8a56ea5fc7787d3de0982015ed47b767557c06
Signed-off-by: Benoît Ganne <bganne@cisco.com>
---

diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk
index 9967338954d..71542d780b6 100644
--- a/build/external/packages/rdma-core.mk
+++ b/build/external/packages/rdma-core.mk
@@ -32,6 +32,7 @@ RDMA_FILES := include/infiniband/verbs.h \
 	      include/infiniband/ib_user_ioctl_verbs.h \
 	      include/rdma/ib_user_verbs.h \
 	      lib/statics/libibverbs.a \
+	      util/librdma_util.a \
 	      lib/statics/libmlx5.a
 
 define  rdma-core_config_cmds
@@ -43,12 +44,14 @@ define  rdma-core_config_cmds
 endef
 
 define  rdma-core_build_cmds
-	$(CMAKE) --build $(rdma-core_build_dir) -- libibverbs.a libmlx5.a > $(rdma-core_build_log)
+	$(CMAKE) --build $(rdma-core_build_dir) -- libibverbs.a librdma_util.a libmlx5.a > $(rdma-core_build_log)
 endef
 
 define  rdma-core_install_cmds
 	mkdir -p $(rdma-core_install_dir)
 	tar -C $(rdma-core_build_dir) --xform='s|/statics/|/|' -hc $(RDMA_FILES) | tar -C $(rdma-core_install_dir) -xv > $(rdma-core_install_log)
+	mv -v $(rdma-core_install_dir)/util/librdma_util.a $(rdma-core_install_dir)/lib >> $(rdma-core_install_log)
+	rmdir $(rdma-core_install_dir)/util
 endef
 
 $(eval $(call package,rdma-core))
diff --git a/src/plugins/rdma/CMakeLists.txt b/src/plugins/rdma/CMakeLists.txt
index 7b6b37cc59b..432330dc55d 100644
--- a/src/plugins/rdma/CMakeLists.txt
+++ b/src/plugins/rdma/CMakeLists.txt
@@ -19,9 +19,10 @@ if (NOT IBVERBS_INCLUDE_DIR)
 endif()
 
 vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.a)
+vpp_plugin_find_library(rdma RDMA_UTIL_LIB librdma_util.a)
 vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a)
 
-if (NOT IBVERBS_LIB OR NOT MLX5_LIB)
+if (NOT IBVERBS_LIB OR NOT RDMA_UTIL_LIB OR NOT MLX5_LIB)
   message(WARNING "rdma plugin - ibverbs not found - rdma plugin disabled")
   return()
 endif()
@@ -30,7 +31,7 @@ if (MLX5_LIB)
   string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive")
 endif()
 
-set(CMAKE_REQUIRED_FLAGS "-fPIC -shared ${IBVERBS_LIB} ${RDMA_LINK_FLAGS}")
+set(CMAKE_REQUIRED_FLAGS "-fPIC -shared ${IBVERBS_LIB} ${RDMA_UTIL_LIB} ${RDMA_LINK_FLAGS}")
 CHECK_C_SOURCE_COMPILES("" IBVERBS_COMPILES_CHECK)
 
 if (NOT IBVERBS_COMPILES_CHECK)
@@ -58,4 +59,5 @@ add_vpp_plugin(rdma
 
   LINK_LIBRARIES
   ${IBVERBS_LIB}
+  ${RDMA_UTIL_LIB}
 )