diff options
| author |   Mohammed Hawari <mohammed@hawari.fr> | 2022-09-20 18:44:36 +0200 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2022-10-05 02:19:30 +0000 |
| commit | 582c81e68622d44200406137d261688adde0aed9 (patch) | |
| tree | 67c4178417859927c35020bbaae2597d70e89060 /build | |
| parent | 9aae8a4a9ef60a910e05adcb2a2e588b73fd43fb (diff) | |
rdma: unhackish build of rdma-core
Change-Id: I2040b560b2a00f8bd176ae6ad46035678a2b249e
Type: improvement
Signed-off-by: Mohammed Hawari <mohammed@hawari.fr>
(cherry picked from commit 45e4e9444d961351178ee108b20525a9c929902d)
Diffstat (limited to 'build')
| -rwxr-xr-x | build/external/deb/debian/rules | 2 | ||||
| -rw-r--r-- | build/external/packages/rdma-core.mk | 19 |
2 files changed, 6 insertions, 15 deletions
diff --git a/build/external/deb/debian/rules b/build/external/deb/debian/rules index cddf1e9c6e8..cf4b4d989b4 100755 --- a/build/external/deb/debian/rules +++ b/build/external/deb/debian/rules @@ -28,3 +28,5 @@ override_dh_install: make $(MAKE_ARGS) install dh_install -p$(PKG) --autodest /opt +override_dh_shlibdeps: + dh_shlibdeps -l$(INSTALL_DIR)lib/ diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk index cf5fa1ab30f..86b42695e63 100644 --- a/build/external/packages/rdma-core.mk +++ b/build/external/packages/rdma-core.mk @@ -32,27 +32,16 @@ define rdma-core_config_cmds -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)) |