From 0aeabb2b518b02ef8cc5d5f6eab03f72be701fa1 Mon Sep 17 00:00:00 2001 From: DanielBar-On Date: Wed, 1 Mar 2017 14:58:37 +0000 Subject: [PATCH] msg/async/rdma: compile with rdma as default Issue: 992583 Issue: 992580 Change-Id: I24128b87294d3083c44c934f7d4bed554dd1f8a4 Signed-off-by: DanielBar-On --- CMakeLists.txt | 2 +- ceph.spec.in | 1 + debian/control | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6b7ffb79091..2d3c11e2290e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,7 @@ else(ENABLE_SHARED) endif(ENABLE_SHARED) set(CMAKE_POSITION_INDEPENDENT_CODE ${ENABLE_SHARED}) -option(WITH_RDMA "Enable RDMA in async messenger" OFF) +option(WITH_RDMA "Enable RDMA in async messenger" ON) if(WITH_RDMA) find_package(rdma REQUIRED) set(HAVE_RDMA ${RDMA_FOUND}) diff --git a/ceph.spec.in b/ceph.spec.in index 404fe2898128..73436e7c3858 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -132,6 +132,7 @@ BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet BuildRequires: yasm +BuildRequires: libibverbs-devel ################################################################################# # distro-conditional dependencies diff --git a/debian/control b/debian/control index 8d82fa69e519..1ae3a8a7662c 100644 --- a/debian/control +++ b/debian/control @@ -33,6 +33,7 @@ Build-Depends: bc, libfcgi-dev, libfuse-dev, libgoogle-perftools-dev [i386 amd64 arm64], + libibverbs-dev, libkeyutils-dev, libleveldb-dev, libnss3-dev, -- 2.47.3