[Pkg-ceph-commits] [ceph] 01/02: Build without rocksdb on armel, mips and mipsel

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch jewel-fix-armel-mipsel-mips
in repository ceph.

commit e82b23cf9ebff189abf4101cbf6849b257455e1e
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Tue Dec 27 21:34:06 2016 +0100

    Build without rocksdb on armel, mips and mipsel
    
    This needs a patch to the build system to not build ceph-dencoder in
    builds without debugging tools.
    
    Rocksdb fails on armel because of a GCC bug:
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=727621
    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735
    
    And on mips/mipsel because atomic operations on long long are not
    supported:
    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56296
---
 debian/patches/build-without-rocksdb.patch | 11 +++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               | 17 ++++++++++++-----
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/debian/patches/build-without-rocksdb.patch b/debian/patches/build-without-rocksdb.patch
new file mode 100644
index 0000000..514033a
--- /dev/null
+++ b/debian/patches/build-without-rocksdb.patch
@@ -0,0 +1,11 @@
+--- a/src/test/Makefile-client.am
++++ b/src/test/Makefile-client.am
+@@ -29,7 +29,7 @@
+ endif
+ 
+ 
+-bin_PROGRAMS += ceph-dencoder
++bin_DEBUGPROGRAMS += ceph-dencoder
+ 
+ noinst_HEADERS += \
+ 	test/encoding/test_ceph_time.h
diff --git a/debian/patches/series b/debian/patches/series
index e8dec41..0f791ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,7 @@ sample.ceph.conf.patch
 virtualenv-never-download.patch
 # Testing patches
 tests-disable.patch
+build-without-rocksdb.patch
 
 ## From Ubuntu
 fix-cycles-arch.patch
diff --git a/debian/rules b/debian/rules
index 637eed6..bd90f7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,20 @@ extraopts += --with-babeltrace
 ## do not build with lttng just yet, see #765842.
 extraopts += --without-lttng
 
-# rocksdb is not packaged by anyone.  build it if we can.
-extraopts += --with-librocksdb-static=check
-
-ifeq ($(DEB_HOST_ARCH), armel)
+no_rocksdb_archs = armel mips mipsel
+ifneq (,$(filter $(DEB_HOST_ARCH), $(no_rocksdb_archs)))
   # armel supports ARMv4t or above instructions sets.
   # libatomic-ops is only usable with Ceph for ARMv6 or above.
-  extraopts += --without-libatomic-ops
+  # rocksdb fails to compile on armel due to a GCC bug
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=727621
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735
+  # rocksdb fails to compile on mips and mipsel because 
+  # atomic operations on long long are not supported:
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56296
+  extraopts += --without-libatomic-ops --without-librocksdb --without-librocksdb-static --disable-libaio --disable-valgrind --without-cluster-tests
+else
+  # rocksdb is not packaged by anyone.  build it if we can.
+  extraopts += --with-librocksdb-static=check
 endif
 
 # Only selected architectures support gperftools

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