aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammed Hawari <mohammed@hawari.fr>2021-01-19 18:19:45 +0100
committerBeno�t Ganne <bganne@cisco.com>2021-01-20 09:23:03 +0000
commitdf849f8ea8750e934a7a2c9ea2d5628b0c209056 (patch)
treec61174b5a440b605c24d15f5aae08e891447d56f
parent1441a6c54128584a86713af4f64f6d92ed4d79a4 (diff)
rdma: fix pkg_config file
When building DPDK with rdma linkage, this patch avoids linking against useless verb providers. It also hard-codes the library directory to lib to fix CentOS behavior. Change-Id: I3acd94adf1b7e59e023346b3c254bd4bba6157df Type: fix Signed-off-by: Mohammed Hawari <mohammed@hawari.fr>
-rw-r--r--build/external/packages/rdma-core.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk
index 65c9c8aa65e..960a2ffa163 100644
--- a/build/external/packages/rdma-core.mk
+++ b/build/external/packages/rdma-core.mk
@@ -39,6 +39,7 @@ define rdma-core_config_cmds
$(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_INSTALL_PREFIX=$(rdma-core_install_dir) \
+ -DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_C_FLAGS='-fPIC -fvisibility=hidden' > $(rdma-core_config_log)
endef
@@ -52,6 +53,8 @@ define rdma-core_install_cmds
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
endef
$(eval $(call package,rdma-core))