[Pkg-ceph-commits] [ceph] 03/06: Resolved build failures on powerpc

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu/zesty
in repository ceph.

commit 113736f062cf311b9250eff13d1d5858d2f1b83d
Author: James Page <james.page at ubuntu.com>
Date:   Sat Jan 14 10:11:40 2017 +0200

    Resolved build failures on powerpc
    
    powerpc builds fail due to missing -latomic in the rocksdb
    component build; ensure that this library is used during
    linking.
---
 debian/patches/powerpc_libatomic.patch | 18 ++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/powerpc_libatomic.patch b/debian/patches/powerpc_libatomic.patch
new file mode 100644
index 0000000..b12da76
--- /dev/null
+++ b/debian/patches/powerpc_libatomic.patch
@@ -0,0 +1,18 @@
+Description: Enforce linking with -latomic for powerpc
+  Resolves build failures on this arch
+Author: James Page <james.page at ubuntu.com>
+Fowarded: no
+
+--- a/src/rocksdb/build_tools/build_detect_platform
++++ b/src/rocksdb/build_tools/build_detect_platform
+@@ -362,6 +362,10 @@ elif test -z "$PORTABLE"; then
+   COMMON_FLAGS="$COMMON_FLAGS -march=native "
+ fi
+ 
++if [ "$TARGET_ARCHITECTURE" = "powerpc" ] ; then
++  PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -latomic"
++fi
++
+ PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
+ PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS $COMMON_FLAGS"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c3be6a0..9b2e175 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ skip-setup.py-makefiles.patch
 disable-openssl-linking.patch
 osd-limit-omap-data-in-push-op.patch
 rgw_rados-creation_time.patch
+powerpc_libatomic.patch

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