RDMA_CORE_DEBUG?=n
-rdma-core_version := 41.0
+# 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_39.1 := 63ba4632fd01173a2331e5b990373330
-rdma-core_tarball_md5sum_41.0 := 2250389cb61a7130133e6411fdeef2f9
+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)
-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_C_FLAGS='-fPIC -fvisibility=hidden' > $(rdma-core_config_log)
+ -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) -- libccan.a libibverbs.a librdma_util.a libmlx5.a libmlx4.a > $(rdma-core_build_log)
- sed 's/^Libs.private:.*/Libs.private: -lmlx4 -lmlx5 -libverbs -lrdma_util -lccan -lpthread/' -i $(rdma-core_build_dir)/lib/pkgconfig/libibverbs.pc >> $(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)/lib/pkgconfig
- cp -avL $(rdma-core_build_dir)/include $(rdma-core_install_dir) > $(rdma-core_install_log)
- cp -avL $(rdma-core_build_dir)/lib/pkgconfig/libibverbs.pc \
- $(rdma-core_build_dir)/lib/pkgconfig/libmlx5.pc \
- $(rdma-core_build_dir)/lib/pkgconfig/libmlx4.pc \
- $(rdma-core_install_dir)/lib/pkgconfig >> $(rdma-core_install_log)
- cp -avL $(rdma-core_build_dir)/lib/statics/libibverbs.a \
- $(rdma-core_build_dir)/lib/statics/libmlx5.a \
- $(rdma-core_build_dir)/lib/statics/libmlx4.a \
- $(rdma-core_build_dir)/util/librdma_util.a \
- $(rdma-core_build_dir)/ccan/libccan.a \
- $(rdma-core_install_dir)/lib >> $(rdma-core_install_log)
+ $(CMAKE) --install $(rdma-core_build_dir) | tee $(rdma-core_install_log)
endef
$(eval $(call package,rdma-core))