RDMA_CORE_DEBUG?=n
-rdma-core_version := 26.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 := 49.0
rdma-core_tarball := rdma-core-$(rdma-core_version).tar.gz
-rdma-core_tarball_md5sum_25.0 := d8839edaae4cb6dacdacc4b5a824854c
-rdma-core_tarball_md5sum_26.0 := e68ad88679f37a0285d4d5b820e6b689
+rdma-core_tarball_md5sum_46.1 := 3ac7c00717ea2720df5d90f8a43ae33a
+rdma-core_tarball_md5sum_49.0 := 9fe3909f19c7e0276c9e546411bbb49c
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
+RDMA_BUILD_TYPE:=RelWithDebInfo
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) \
- -DENABLE_STATIC=1 -DENABLE_RESOLVE_NEIGH=0 -DNO_PYVERBS=1 -DENABLE_VALGRIND=0 \
- -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) --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
+ $(CMAKE) --install $(rdma-core_build_dir) | tee $(rdma-core_install_log)
endef
$(eval $(call package,rdma-core))