rdma: bump to rdma-core 38.0

[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 9961c80..87139e1 100644 (file)
--- a/build/external/packages/rdma-core.mk
+++ b/build/external/packages/rdma-core.mk
@@ -11,36 +11,48 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-rdma-core_version             := 23
+RDMA_CORE_DEBUG?=n
+
+rdma-core_version             := 38.0
 rdma-core_tarball             := rdma-core-$(rdma-core_version).tar.gz
-rdma-core_tarball_md5sum_22.1 := dde4d30e3db20893408ae51041117034
-rdma-core_tarball_md5sum_23 := c78575735c4a71609c1a214ea16cd8dc
+rdma-core_tarball_md5sum_35.0 := 85afb89ec536ef229c0fef6cb87e8665
+rdma-core_tarball_md5sum_38.0 := 44e14dd392ac139a0d452148eb0a0514
 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_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 \
-             lib/statics/libmlx5.a
+RDMA_BUILD_TYPE:=RelWithDebInfo
+ifeq ($(RDMA_CORE_DEBUG),y)
+RDMA_BUILD_TYPE:=Debug
+endif
 
 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=Release \
+           -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
 
 define  rdma-core_build_cmds
-       $(CMAKE) --build $(rdma-core_build_dir) -- libibverbs.a libmlx5.a > $(rdma-core_build_log)
+       $(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) --xform='s|/statics/|/|' -hc $(RDMA_FILES) | tar -C $(rdma-core_install_dir) -xv > $(rdma-core_install_log)
+       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)
 endef
 
 $(eval $(call package,rdma-core))