[Pkg-ceph-commits] [ceph] 26/59: Use gcc-7 for arm64 builds

[James Downing Page]

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

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

commit bf3fc7543a36155b9c3bd557b3ebbec6cee77209
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jul 6 20:01:47 2017 +0000

    Use gcc-7 for arm64 builds
---
 debian/changelog | 2 ++
 debian/control   | 1 +
 debian/rules     | 8 +++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2e4c166..385d15e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ ceph (12.1.0-0ubuntu1) UNRELEASED; urgency=medium
       to resolve compatibility with gcc-6 on i386.
   * d/p/ec-isa-module.patch: Drop versioning of libec_isa.so to ensure
     that it gets installed as part of the package.
+  * d/control,rules: Workaround arm64 compilation segfault by forcing
+    use of gcc-7 toolchain for this architecture.
 
  -- James Page <james.page at ubuntu.com>  Mon, 26 Jun 2017 15:24:40 +0000
 
diff --git a/debian/control b/debian/control
index 75cd557..bb20454 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: cmake,
                dh-python,
                dh-systemd (>= 1.5),
                dpkg-dev (>= 1.16.1~),
+               g++-7 [arm64],
                gperf,
                javahelper,
                junit4,
diff --git a/debian/rules b/debian/rules
index b9b7664..2fc5cd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,8 +46,14 @@ ifeq ($(DEB_HOST_ARCH), s390x)
   extraopts += -DWITH_RADOSGW_BEAST_FRONTEND=OFF
 endif
 
+ifeq ($(DEB_HOST_ARCH), arm64)
+  # Use gcc-7 toolchain for arm64 until
+  # https://bugs.launchpad.net/ubuntu/+source/gcc-6/+bug/1702044 is resolved
+  extraopts += -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7
+endif
+
 %:
-	dh $@ --buildsystem=cmake --with javahelper,python2,python3,systemd --parallel
+	dh $@ --buildsystem=cmake --with javahelper,python2,python3,systemd --parallel --max-parallel=2
 
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem=cmake -- $(extraopts)

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