[gmp-ecm] 01/01: Imported Debian patch 7.0.1+ds-2 (FTBFS[s390x] fix release)

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository gmp-ecm.

commit bd3699898a5a7bdd702729d232b0e89a2f4fca42
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Wed Jun 15 15:03:29 2016 +0100

    Imported Debian patch 7.0.1+ds-2 (FTBFS[s390x] fix release)
---
 debian/changelog | 11 ++++++++++-
 debian/control   |  1 +
 debian/rules     |  8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e159854..5a85aab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gmp-ecm (7.0.1+ds-2) unstable; urgency=medium
+
+  * FTBFS[s390x] fix release (Closes: #827034), ad hoc workaround a gcc-5 bug
+    not fully isolated.
+  * Debianization:
+    - debian/rules, force -O3 option.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 15 Jun 2016 14:00:32 +0000
+
 gmp-ecm (7.0.1+ds-1) unstable; urgency=medium
 
   * New upstream release (Closes: #819702).
@@ -42,7 +51,7 @@ gmp-ecm (7.0+ds-1) unstable; urgency=medium
 
 gmp-ecm (6.4.4+ds-5) unstable; urgency=medium
 
-  * FTBFS bug fix release (Closes: #806619):
+  * FTBFS bug fix release (Closes: #806619).
   * Debianization:
     - arch/indep build scheme, introduce.
 
diff --git a/debian/control b/debian/control
index 3634723..49b59cb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9),
  autotools-dev, gnulib, m4, dh-autoreconf, libtool,
+ gcc-6 [s390x],
  libgmp-dev (>= 2:6.0)
 #Build-Depends-Indep:
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index 60ace5c..8dd0ccb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,15 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq (s390x,$(DEB_HOST_ARCH))
+export CC = gcc-6
+endif
+
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+CFLAGS := $(subst -O2,-O3,$(CFLAGS))
+
 default:
 	@uscan --no-conf --dehs --report || true
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmp-ecm.git