gnu: Add ceph.

* gnu/packages/storage.scm,
  gnu/packages/patches/ceph-disable-cpu-optimizations.patch,
  gnu/packages/patches/ceph-skip-collect-sys-info-test.patch,
  gnu/packages/patches/ceph-skip-unittest_blockdev.patch: New files.
* gnu/local.mk (GNU_SYSTEM_MODULES, dist_patch_DATA): Register it.

3 files changed, 103 insertions, 0 deletions

diff --git a/gnu/packages/patches/ceph-disable-cpu-optimizations.patch b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch
new file mode 100644
index 0000000000..f4d258b602
--- /dev/null
+++ b/gnu/packages/patches/ceph-disable-cpu-optimizations.patch
@@ -0,0 +1,46 @@
+Disable CPU optimizations not supported by the vast majority of
+x86_64 systems. Also don't add anything for i686.
+
+--- a/cmake/modules/SIMDExt.cmake	2017-03-23 22:22:58.254071694 +0100
++++ b/cmake/modules/SIMDExt.cmake	2017-03-23 22:23:22.446848845 +0100
+@@ -6,10 +6,6 @@
+ # HAVE_INTEL_SSE
+ # HAVE_INTEL_SSE2
+ # HAVE_INTEL_SSE3
+-# HAVE_INTEL_SSSE3
+-# HAVE_INTEL_PCLMUL
+-# HAVE_INTEL_SSE4_1
+-# HAVE_INTEL_SSE4_2
+ #
+ # SIMD_COMPILE_FLAGS
+ #
+@@ -41,7 +37,7 @@
+   if(HAVE_ARM_NEON)
+     set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon")
+   endif()
+-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
+   set(HAVE_INTEL 1) 
+   CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE)
+   if(HAVE_INTEL_SSE)
+@@ -55,20 +51,4 @@
+   if(HAVE_INTEL_SSE3)
+     set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
+   endif()
+-  CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3)
+-  if(HAVE_INTEL_SSSE3)
+-    set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
+-  endif()
+-  CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL)
+-  if(HAVE_INTEL_PCLMUL)
+-    set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul")
+-  endif()
+-  CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1)
+-  if(HAVE_INTEL_SSE4_1)
+-    set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1")
+-  endif()
+-  CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2)
+-  if(HAVE_INTEL_SSE4_2)
+-    set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
+-  endif()
+ endif()
diff --git a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
new file mode 100644
index 0000000000..f210799254
--- /dev/null
+++ b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
@@ -0,0 +1,29 @@
+This test fails because /etc/os-release is not available.
+
+diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc
+index 288dd37db1..95b6cd4b30 100644
+--- a/src/test/common/test_util.cc
++++ b/src/test/common/test_util.cc
+@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize)
+ 
+   ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr));
+ }
+-
+-#if defined(__linux__)
+-TEST(util, collect_sys_info)
+-{
+-  map<string, string> sys_info;
+-
+-  CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_CLIENT))->get();
+-  collect_sys_info(&sys_info, cct);
+-
+-  ASSERT_TRUE(sys_info.find("distro") != sys_info.end());
+-  ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
+-  ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end());
+-
+-  cct->put();
+-}
+-#endif
+-- 
+2.11.1
+
diff --git a/gnu/packages/patches/ceph-skip-unittest_blockdev.patch b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch
new file mode 100644
index 0000000000..43b9984862
--- /dev/null
+++ b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch
@@ -0,0 +1,28 @@
+This test tries to walk a sysfs path and hits a null pointer exception.
+
+/tmp/guix-build-ceph-12.0.0.drv-0/ceph-12.0.0/src/test/common/test_blkdev.cc:32: Failure
+Expected: (dir) != (nullptr), actual: NULL vs 8-byte object <00-00 00-00 00-00 00-00>
+
+diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
+index 5172663898..ac84085eaa 100644
+--- a/src/test/common/CMakeLists.txt
++++ b/src/test/common/CMakeLists.txt
+@@ -12,15 +12,6 @@ target_link_libraries(get_command_descriptions
+   ${CMAKE_DL_LIBS}
+   )
+ 
+-if(HAVE_BLKID)
+-# unittest_blkdev
+-add_executable(unittest_blkdev
+-  test_blkdev.cc
+-  )
+-add_ceph_unittest(unittest_blkdev ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_blkdev)
+-target_link_libraries(unittest_blkdev global ${BLKID_LIBRARIES})
+-endif(HAVE_BLKID)
+-
+ # unittest_bloom_filter
+ add_executable(unittest_bloom_filter
+   test_bloom_filter.cc
+-- 
+2.11.1
+