diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2019-03-29 15:41:48 -0400 |
|---|---|---|
| committer | Thomas F Herbert <therbert@redhat.com> | 2019-04-03 12:45:45 -0400 |
| commit | dc66aadb9ad7e4a7623e6689a21a46aadb9942b4 (patch) | |
| tree | ff8558e2284b3bc55eec612e0bcfdebb884c5113 | |
| parent | 82c5dda455ce56ffaf8813b7fbee661e6dbb7cea (diff) | |
Fix problem building rdma-core.
Recent patches add rdma-core.
They are not building in Centos because of differences
in cmake. This patch fixes that problem by defining
CMAKE for all external builds.
Change-Id: I3eea869226385207500c5a1217bd7330140ca462
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
| -rw-r--r-- | build/external/Makefile | 6 | ||||
| -rw-r--r-- | build/external/packages/rdma-core.mk | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/build/external/Makefile b/build/external/Makefile index aed8b2ecb27..c56e16d1f51 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -27,6 +27,12 @@ JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\ B := $(BUILD_DIR) I := $(INSTALL_DIR) +ifneq ($(shell which cmake3),) +CMAKE?=cmake3 +else +CMAKE?=cmake +endif + include packages.mk include packages/nasm.mk include packages/ipsec-mb.mk diff --git a/build/external/packages/rdma-core.mk b/build/external/packages/rdma-core.mk index 0e8c878034e..d3363e141bc 100644 --- a/build/external/packages/rdma-core.mk +++ b/build/external/packages/rdma-core.mk @@ -28,14 +28,14 @@ RDMA_FILES := include/infiniband/verbs.h \ define rdma-core_config_cmds cd $(rdma-core_build_dir) && \ - cmake -G Ninja $(rdma-core_src_dir) \ + $(CMAKE) -G Ninja $(rdma-core_src_dir) \ -DENABLE_STATIC=1 -DENABLE_RESOLVE_NEIGH=0 -DNO_PYVERBS=1 -DENABLE_VALGRIND=0 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_C_FLAGS=-fPIC > $(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) -- libibverbs.a libmlx5.a > $(rdma-core_build_log) endef define rdma-core_install_cmds |