rpm,install-deps,cmake: install {c-ares,fmt}-devel

* ceph.spec.in: c-ares-devel and fmt-devel are installed as
  dependencies fo seastar.
* install-deps.sh: libfmt-dev is missing in xenial, so we only
  install libc-ares-dev for ubuntu in install-deps.sh .
* cmake: build libfmt if it's not found.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 4850e8f283f0025d741a43828c2ef0ee9e708cfc..8b08300f304d9d9d5306d8c189399127da608941 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -177,7 +177,10 @@ BuildRequires:     python%{_python_buildid}-virtualenv
 BuildRequires: socat
 %endif
 %if 0%{with seastar}
+BuildRequires:  c-ares-devel
+BuildRequires:  cryptopp-devel
 BuildRequires:  gnutls-devel
+BuildRequires:  fmt-devel
 BuildRequires:  hwloc-devel
 BuildRequires:  libpciaccess-devel
 BuildRequires:  lksctp-tools-devel

diff --git a/install-deps.sh b/install-deps.sh
index ebc5728024b32d751e41807881c6b18f96d2d99d..3dc3828af2a23ee66b869c15646775bea97d8670 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -32,7 +32,7 @@ fi
 function install_seastar_deps {
     if $with_seastar; then
         $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y \
-              ragel libhwloc-dev libnuma-dev libpciaccess-dev \
+              ragel libc-ares-dev libhwloc-dev libnuma-dev libpciaccess-dev \
               libcrypto++-dev libgnutls28-dev libsctp-dev libprotobuf-dev \
               protobuf-compiler systemtap-sdt-dev libyaml-cpp-dev
     fi

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c0d7590a548908f21f3148f2752db6ce9baf37e0..9d370cc5dca4e6a48633c926958994aff3903451 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -384,7 +384,15 @@ include_directories("${CMAKE_SOURCE_DIR}/src/dmclock/support/src")
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/googletest/googletest/include")
 
 if(WITH_SEASTAR)
-  set(SEASTAR_ENABLE_TESTS OFF CACHE BOOL "disable seastar testing")
+  find_package(fmt CONFIG QUIET)
+  if(NOT fmt_FOUND)
+    add_subdirectory(fmt)
+  endif()
+  macro(find_package name)
+    if(NOT TARGET ${name})
+      _find_package(${ARGV})
+    endif()
+  endmacro ()
   add_subdirectory(seastar)
   add_subdirectory(crimson)
 endif()