From 9ca188d4046b3b47a22183541e0db08ed1b2bd71 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 22 Apr 2016 15:31:35 +0200 Subject: [PATCH] Do not use -momit-leaf-frame-pointer flag --- ...ot-use-momit-leaf-frame-pointer-flag.patch | 30 +++++++++++++++++++ ceph.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0002-Do-not-use-momit-leaf-frame-pointer-flag.patch diff --git a/0002-Do-not-use-momit-leaf-frame-pointer-flag.patch b/0002-Do-not-use-momit-leaf-frame-pointer-flag.patch new file mode 100644 index 0000000..46064ff --- /dev/null +++ b/0002-Do-not-use-momit-leaf-frame-pointer-flag.patch @@ -0,0 +1,30 @@ +From ed5b88e6079b11b5f33b0795a5254e8e9c5f6e54 Mon Sep 17 00:00:00 2001 +From: Boris Ranto +Date: Fri, 22 Apr 2016 15:30:22 +0200 +Subject: [PATCH] Do not use -momit-leaf-frame-pointer flag + +The -momit-leaf-frame-pointer flag that rocksdb is being built with does +not exist on armv7hl, this patch disables the flag. + +Signed-off-by: Boris Ranto +--- + src/rocksdb/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/rocksdb/Makefile b/src/rocksdb/Makefile +index c64ea36..b3758a5 100644 +--- a/src/rocksdb/Makefile ++++ b/src/rocksdb/Makefile +@@ -84,9 +84,6 @@ 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 +-OPT += -momit-leaf-frame-pointer +-endif + endif + + # if we're compiling for release, compile without debug code (-DNDEBUG) and +-- +2.5.5 + diff --git a/ceph.spec b/ceph.spec index be9e2c4..0973a04 100644 --- a/ceph.spec +++ b/ceph.spec @@ -75,7 +75,7 @@ restorecon -R /var/log/radosgw > /dev/null 2>&1; ################################################################################# Name: ceph Version: 10.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: User space components of the Ceph file system License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT @@ -85,6 +85,7 @@ Group: System/Filesystems URL: http://ceph.com/ Source0: http://ceph.com/download/%{name}-%{version}.tar.gz Patch1: 0001-Disable-erasure_codelib-neon-build.patch +Patch2: 0002-Do-not-use-momit-leaf-frame-pointer-flag.patch ################################################################################# # dependencies that apply across all distro families ################################################################################# @@ -659,6 +660,7 @@ python-cephfs instead. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %if 0%{with cephfs_java} @@ -1547,6 +1549,9 @@ exit 0 %changelog +* Fri Apr 22 2016 Boris Ranto - 10.2.0-2 +- Do not use -momit-leaf-frame-pointer flag + * Fri Apr 22 2016 Boris Ranto - - - Rebase to version 10.2.0 - Disable erasure_codelib neon build