X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2Fpackages%2Frdma-core.mk;h=c163284b833a6c0e7e6e02b5738cb3cc492796e0;hb=61ab0947219c93590f6ec1198da93fe339ba70ca;hp=e7525202214a6862e819219397ecf654ee14741e;hpb=a54fce3a26d56918e212c0cdf1f72528c48c6123;p=vpp.git

diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk
index e7525202214..c163284b833 100644
--- a/build/external/packages/rdma-core.mk
+++ b/build/external/packages/rdma-core.mk
@@ -13,10 +13,21 @@
 
 RDMA_CORE_DEBUG?=n
 
-rdma-core_version             := 31.1
+# NOTE: When updating the rdma-core version in conjunction with an update of the
+#       dpdk version, please update ../mlx_rdma_dpdk_matrix.txt to include the
+#       updated version matrix with the dpdk and rdma-core version.
+#
+#       Also, please verify that the DPDK RDMA driver is built into the dpdk plugin
+#       as follows:
+#       	1. from workspace root directory, 'make -C build/external build-deb'
+#       	2. Verify that the file build/external/dpdk_mlx_default.sh was generated
+#              and contains 'DPDK_MLX_DEFAULT=y'
+#
+rdma-core_version             := 46.1
 rdma-core_tarball             := rdma-core-$(rdma-core_version).tar.gz
-rdma-core_tarball_md5sum_31.0 := 6076b2cfd5b0b22b88f1fb8dffd1aef7
-rdma-core_tarball_md5sum_31.1 := f14b3eba775c2eba0d9433bfb3bae637
+rdma-core_tarball_md5sum_43.0 := 3785fd2b35cd41043ab53226fc112d41
+rdma-core_tarball_md5sum_45.0 := 2b170e6d2ad66fb688580520a16d1ad5
+rdma-core_tarball_md5sum_46.1 := 3ac7c00717ea2720df5d90f8a43ae33a
 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)
@@ -26,28 +37,22 @@ ifeq ($(RDMA_CORE_DEBUG),y)
 RDMA_BUILD_TYPE:=Debug
 endif
 
-BUILD_FILES := include/ \
-	       lib/statics/libibverbs.a \
-	       lib/statics/libmlx5.a \
-	       util/librdma_util.a
-
 define  rdma-core_config_cmds
 	cd $(rdma-core_build_dir) && \
 	  $(CMAKE) -G Ninja $(rdma-core_src_dir) \
-	    -DENABLE_STATIC=1 -DENABLE_RESOLVE_NEIGH=0 -DNO_PYVERBS=1 -DENABLE_VALGRIND=0 -DIN_PLACE=1 \
-	    -DCMAKE_BUILD_TYPE=$(RDMA_BUILD_TYPE) \
-	    -DCMAKE_C_FLAGS='-fPIC -fvisibility=hidden' > $(rdma-core_config_log)
+	    -DENABLE_STATIC=1 -DENABLE_RESOLVE_NEIGH=0 -DNO_PYVERBS=1 -DENABLE_VALGRIND=0\
+	    -DCMAKE_BUILD_TYPE=$(RDMA_BUILD_TYPE) -DCMAKE_INSTALL_PREFIX=$(rdma-core_install_dir) \
+	    -DCMAKE_INSTALL_LIBDIR=lib \
+	    -DCMAKE_INSTALL_RUNDIR:PATH=/run \
+	    -DCMAKE_C_FLAGS='-fPIC' -DNO_MAN_PAGES=ON | tee $(rdma-core_config_log)
 endef
 
 define  rdma-core_build_cmds
-	$(CMAKE) --build $(rdma-core_build_dir) -- libibverbs.a librdma_util.a libmlx5.a > $(rdma-core_build_log)
+	$(CMAKE) --build $(rdma-core_build_dir) | tee $(rdma-core_build_log)
 endef
 
 define  rdma-core_install_cmds
-	mkdir -p $(rdma-core_install_dir)
-	tar -C $(rdma-core_build_dir) -hc $(BUILD_FILES) | tar -C $(rdma-core_install_dir) -xv > $(rdma-core_install_log)
-	find $(rdma-core_install_dir) -name '*.a' -exec mv -v {} $(rdma-core_install_dir)/lib \; >> $(rdma-core_install_log)
-	rmdir -v $(rdma-core_install_dir)/util $(rdma-core_install_dir)/lib/statics >> $(rdma-core_install_log)
+	$(CMAKE) --install $(rdma-core_build_dir) | tee $(rdma-core_install_log)
 endef
 
 $(eval $(call package,rdma-core))