X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2Fpackages%2Frdma-core.mk;h=9d59da0ff12089aa18735d7d28ac8925c1005300;hb=eb89b9093bc5c7b0b1511cf3d59454e15f9e4d92;hp=0e8c878034e90020d6ef81c0ecf0e20a2f21e2e6;hpb=fe750c248be58b76479836639fbd0c4617210aa5;p=vpp.git

diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk
index 0e8c878034e..9d59da0ff12 100644
--- a/build/external/packages/rdma-core.mk
+++ b/build/external/packages/rdma-core.mk
@@ -11,36 +11,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-rdma-core_version             := 23
+RDMA_CORE_DEBUG?=n
+
+rdma-core_version             := 28.0
 rdma-core_tarball             := rdma-core-$(rdma-core_version).tar.gz
-rdma-core_tarball_md5sum_22.1 := dde4d30e3db20893408ae51041117034
-rdma-core_tarball_md5sum_23 := c78575735c4a71609c1a214ea16cd8dc
+rdma-core_tarball_md5sum_25.0 := d8839edaae4cb6dacdacc4b5a824854c
+rdma-core_tarball_md5sum_26.0 := e68ad88679f37a0285d4d5b820e6b689
+rdma-core_tarball_md5sum_28.0 := 780125feed6c599f2f22228db1a5996e
 rdma-core_tarball_md5sum      := $(rdma-core_tarball_md5sum_$(rdma-core_version))
 rdma-core_tarball_strip_dirs  := 1
 rdma-core_url                 := http://github.com/linux-rdma/rdma-core/releases/download/v$(rdma-core_version)/$(rdma-core_tarball)
 
+RDMA_BUILD_TYPE:=Release
+ifeq ($(RDMA_CORE_DEBUG),y)
+RDMA_BUILD_TYPE:=Debug
+endif
+
 RDMA_FILES := include/infiniband/verbs.h \
 	      include/infiniband/verbs_api.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
 	cd $(rdma-core_build_dir) && \
-	  cmake -G Ninja $(rdma-core_src_dir) \
+	  $(CMAKE) -G Ninja $(rdma-core_src_dir) \
 	    -DENABLE_STATIC=1 -DENABLE_RESOLVE_NEIGH=0 -DNO_PYVERBS=1 -DENABLE_VALGRIND=0 \
-	    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	    -DCMAKE_C_FLAGS=-fPIC > $(rdma-core_config_log)
+	    -DCMAKE_BUILD_TYPE=$(RDMA_BUILD_TYPE) \
+	    -DCMAKE_C_FLAGS='-fPIC -fvisibility=hidden' > $(rdma-core_config_log)
 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))