diff options
| -rw-r--r-- | build/external/packages/rdma-core.mk | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk index 960a2ffa163..b8092e4cb4d 100644 --- a/build/external/packages/rdma-core.mk +++ b/build/external/packages/rdma-core.mk @@ -13,10 +13,10 @@ RDMA_CORE_DEBUG?=n -rdma-core_version := 31.1 +rdma-core_version := 35.0 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_35.0 := 85afb89ec536ef229c0fef6cb87e8665 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,14 +26,6 @@ ifeq ($(RDMA_CORE_DEBUG),y) RDMA_BUILD_TYPE:=Debug endif -BUILD_FILES := include/ \ - lib/statics/libibverbs.a \ - lib/statics/libmlx5.a \ - lib/statics/libmlx4.a \ - lib/pkgconfig/ \ - util/librdma_util.a \ - ccan/libccan.a - define rdma-core_config_cmds cd $(rdma-core_build_dir) && \ $(CMAKE) -G Ninja $(rdma-core_src_dir) \ @@ -45,16 +37,22 @@ 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) 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) - sed '/Libs.private:/ s/$$/ -lrdma_util -lccan/' -i $(rdma-core_install_dir)/lib/pkgconfig/libibverbs.pc - sed '/Libs.private:/ s/ \S*\(rdmav25\)\S*//g' -i $(rdma-core_install_dir)/lib/pkgconfig/libibverbs.pc - sed '/Libs.private:/ s/-lefa//g' -i $(rdma-core_install_dir)/lib/pkgconfig/libibverbs.pc + mkdir -p $(rdma-core_install_dir)/lib/pkgconfig + cp -av $(rdma-core_build_dir)/include $(rdma-core_install_dir) > $(rdma-core_install_log) + cp -v $(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 -v $(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) endef $(eval $(call package,rdma-core)) |