[Pkg-ceph-commits] [ceph] 22/43: Rename rocksdb patch, reference upstream pull request.

[Gaudenz Steinlin]

This is an automated email from the git hooks/post-receive script.

gaudenz pushed a commit to branch jewel-gaudenz
in repository ceph.

commit 3e4b30184ffc5317e9a15ab99e5da8a1550d368d
Author: James Page <james.page at ubuntu.com>
Date:   Mon Feb 29 09:26:04 2016 +0000

    Rename rocksdb patch, reference upstream pull request.
    
    Gbp-Dch: ignore
---
 debian/patches/{rocksdb-ftbfs.patch => rocksdb-flags.patch} | 9 ++++-----
 debian/patches/series                                       | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/patches/rocksdb-ftbfs.patch b/debian/patches/rocksdb-flags.patch
similarity index 59%
rename from debian/patches/rocksdb-ftbfs.patch
rename to debian/patches/rocksdb-flags.patch
index 2110eef..68f6671 100644
--- a/debian/patches/rocksdb-ftbfs.patch
+++ b/debian/patches/rocksdb-flags.patch
@@ -1,17 +1,16 @@
-Description: Misc fixups to make rocksdb work on anything other than x86
+Description: Ensure that -momit-leaf-frame-pointer is only used on architectures that support it
 Author: James Page <james.page at ubuntu.com>
-Forwarded: no
+Forwarded: https://github.com/facebook/rocksdb/pull/1019
 
 --- a/src/rocksdb/Makefile
 +++ b/src/rocksdb/Makefile
-@@ -84,7 +84,9 @@ endif
+@@ -84,7 +84,8 @@ endif
  # compile with -O2 if debug level is not 2
  ifneq ($(DEBUG_LEVEL), 2)
  OPT += -O2 -fno-omit-frame-pointer
 -ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer
 +# Skip for archs that don't support -momit-leaf-frame-pointer
-+no_omit_leaf_frame_pointer = ppc ppc64 ppc64le armv7l s390x
-+ifeq (,$(filter $(MACHINE), $(no_omit_leaf_frame_pointer)))
++ifeq (,$(shell $(CXX) -fsyntax-only -momit-leaf-frame-pointer -xc /dev/null 2>&1))
  OPT += -momit-leaf-frame-pointer
  endif
  endif
diff --git a/debian/patches/series b/debian/patches/series
index 52f4c65..3ae6cad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,4 @@ tests-disable.patch
 
 ## From Ubuntu
 fix-cycles-arch.patch
-rocksdb-ftbfs.patch
+rocksdb-flags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git