[arch-commits] Commit in ceph/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, June 2, 2018 @ 15:55:03
  Author: foutrelis
Revision: 337805

Disable FAIL_ON_WARNINGS for rocksdb

Added:
  ceph/trunk/disable-fail-on-warnings-for-rocksdb.patch
Modified:
  ceph/trunk/PKGBUILD

--------------------------------------------+
 PKGBUILD                                   |    2 +
 disable-fail-on-warnings-for-rocksdb.patch |   28 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-02 15:54:16 UTC (rev 337804)
+++ PKGBUILD	2018-06-02 15:55:03 UTC (rev 337805)
@@ -22,6 +22,7 @@
 options=('emptydirs')
 source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
         'ceph.sysusers'
+        'disable-fail-on-warnings-for-rocksdb.patch'
         'fix-ceph_disk-python-interpreter.patch'
         'fix-or-disable-broken-tests.patch'
         'fix-python2-paths.patch'
@@ -28,6 +29,7 @@
         'remove-distro-version-detection.patch')
 sha512sums=('bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
+            '8991759dd968fa073c5ef37c9a9d4513dded9090db0ba33eed57fae03c9ef497f8f99b0d912a3f9b64cd711fb0185fb60c130e247e6ddfe9ae96f6899c12380a'
             '7abd94a333fb0d6c9f7156d69ed6d4bf123f0f3030407f4347209d677b282e5023664d43e74a21a27b7856d3493ae469a17ea8a810331c7266018cc34eee4841'
             '89699b0a3d4b7e5f184533a5f658270ca4b942a8af82b106a844c41a652bdb6eaf7cd840c1a4574e88993a8fdedf29c3d066ff22786c5e44122328c77829d107'
             'ead2c5fa20cf2e41041f52039acb5fb513922270bdacde234e7ae8e7fd3375ba63e9e3a930a717829577d4d551fa05151c6709a728cb43ef7f930983b38fd762'

Added: disable-fail-on-warnings-for-rocksdb.patch
===================================================================
--- disable-fail-on-warnings-for-rocksdb.patch	                        (rev 0)
+++ disable-fail-on-warnings-for-rocksdb.patch	2018-06-02 15:55:03 UTC (rev 337805)
@@ -0,0 +1,28 @@
+From 6559a850512ddefef384d2733823ac2cb8027e3a Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai at redhat.com>
+Date: Sat, 9 Dec 2017 20:18:39 +0800
+Subject: [PATCH] cmake: disable FAIL_ON_WARNINGS for rocksdb
+
+otherwise -Werror=implicit-fallthrough will fail the build with GCC-7
+
+Signed-off-by: Kefu Chai <kchai at redhat.com>
+---
+ src/CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d62f7458058e..8e0ad577887a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -17,10 +17,7 @@ function(do_build_rocksdb)
+   list(APPEND ROCKSDB_CMAKE_ARGS -DPORTABLE=ON)
+   list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR})
+   list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+-
+-  if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+-    list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF)
+-  endif()
++  list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF)
+ 
+   # we use an external project and copy the sources to bin directory to ensure
+   # that object files are built outside of the source tree.