rdma: unhackish build of rdma-core

[vpp.git] / build / external / packages / rdma-core.mk

diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk
index 79fcce6..86b4269 100644 (file)
--- a/build/external/packages/rdma-core.mk
+++ b/build/external/packages/rdma-core.mk
@@ -13,11 +13,10 @@
 
 RDMA_CORE_DEBUG?=n
 
-rdma-core_version             := 28.0
+rdma-core_version             := 41.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_28.0 := 780125feed6c599f2f22228db1a5996e
+rdma-core_tarball_md5sum_39.1 := 63ba4632fd01173a2331e5b990373330
+rdma-core_tarball_md5sum_41.0 := 2250389cb61a7130133e6411fdeef2f9
 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)
@@ -27,28 +26,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))