[Pkg-ceph-commits] [ceph] 07/14: Add patch to set g++ flags correctly across all archs

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.

commit aa54d479368879f56cfdb9ca23f848cb1d05b132
Author: James Page <james.page at ubuntu.com>
Date:   Fri Feb 26 22:55:22 2016 +0000

    Add patch to set g++ flags correctly across all archs
---
 debian/patches/rocksdb-ftbfs.patch | 17 +++++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 18 insertions(+)

diff --git a/debian/patches/rocksdb-ftbfs.patch b/debian/patches/rocksdb-ftbfs.patch
new file mode 100644
index 0000000..7a236e3
--- /dev/null
+++ b/debian/patches/rocksdb-ftbfs.patch
@@ -0,0 +1,17 @@
+Description: Misc fixups to make rocksdb work on anything other than x86
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+--- a/src/rocksdb/Makefile
++++ b/src/rocksdb/Makefile
+@@ -84,7 +84,9 @@ 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
++ifeq (,$(filter $(MACHINE), $(no_omit_leaf_frame_pointer)))
+ OPT += -momit-leaf-frame-pointer
+ endif
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index eb26730..6f1cca1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ fix-argparse-defaults.patch
 fix-cycles-arch.patch
 pybind-flags.patch
 fix-systemd-escaping.patch
+rocksdb-ftbfs.patch

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