[Pkg-ceph-commits] [ceph] 59/85: Drop rocksdb-flags patch applied upstream

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch jewel
in repository ceph.

commit ef254491a03a99ee827b8c1e8bcf406f9e6df99f
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Wed Dec 14 16:44:53 2016 +0100

    Drop rocksdb-flags patch applied upstream
---
 debian/patches/rocksdb-flags.patch | 16 ----------------
 debian/patches/series              |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/rocksdb-flags.patch b/debian/patches/rocksdb-flags.patch
deleted file mode 100644
index 68f6671..0000000
--- a/debian/patches/rocksdb-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Ensure that -momit-leaf-frame-pointer is only used on architectures that support it
-Author: James Page <james.page at ubuntu.com>
-Forwarded: https://github.com/facebook/rocksdb/pull/1019
-
---- a/src/rocksdb/Makefile
-+++ b/src/rocksdb/Makefile
-@@ -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
-+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 5bb8dd2..32564b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,5 @@ tests-disable.patch
 
 ## From Ubuntu
 fix-cycles-arch.patch
-rocksdb-flags.patch
 skip-setup.py-makefiles.patch
 disable-openssl-linking.patch

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