[Python-modules-commits] [shiboken] 01/01: Work-around broken gcc-7 on mips64el for now by using gcc-6

[Raphaël Hertzog]

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

hertzog pushed a commit to annotated tag debian/1.2.2-5
in repository shiboken.

commit d8bc4e95cb36b67b7bda9a35a204a0e7d143c3b4
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Fri Aug 18 20:51:19 2017 +0200

    Work-around broken gcc-7 on mips64el for now by using gcc-6
    
    This change should be reverted once #871514 is fixed.
---
 debian/changelog | 8 ++++++++
 debian/control   | 4 +++-
 debian/rules     | 8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ed09ea7..aef5de4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shiboken (1.2.2-5) unstable; urgency=medium
+
+  * Team upload.
+  * Work-around broken gcc-7 on mips64el for now by using gcc-6. This change
+    should be reverted once #871514 is fixed.
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Fri, 18 Aug 2017 20:42:31 +0200
+
 shiboken (1.2.2-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1a2552f..b53e85a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 9), cmake (>= 2.8.4+dfsg.1-3~
  python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3),
  python-numpy, python-numpy-dbg,
  python3-all-dev, python3-all-dbg,
- python3-numpy, python3-numpy-dbg
+ python3-numpy, python3-numpy-dbg,
+# Use gcc-6 on mips64el, to drop once #871514 is fixed
+ g++-6 [mips64el]
 Build-Depends-Indep: python-sphinx
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.3
diff --git a/debian/rules b/debian/rules
index b8acaa4..9f6cb4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,14 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 CMAKE_COMMON_OPTIONS := -DCMAKE_SKIP_RPATH=true \
 			-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
 
+# Use gcc-6 on mips64el, to drop once #871514 is fixed
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq ($(DEB_HOST_ARCH),mips64el)
+	export CC=gcc-6
+	export GCC=gcc-6
+	export CXX=g++-6
+endif
+
 #### CONFIGURE ####
 
 override_dh_auto_configure: configure_2 configure_3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/shiboken.git