[flint] 01/01: Use gcc-5 and g++-5 on mips and mipsel

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository flint.

commit 5ba6d9e85c98210ebf5bd3c197959235f062e40e
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Thu Nov 17 19:45:19 2016 +0100

    Use gcc-5 and g++-5 on mips and mipsel
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f068c14..a9b8726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flint (2.5.2-13) UNRELEASED; urgency=medium
+
+  * Re-enable all hardenings since it wasn't the problem.
+  * Add depend on gcc-5&g++-5 and use it for mips and mipsel.
+
+ -- Julien Puydt <julien.puydt at laposte.net>  Thu, 17 Nov 2016 19:43:56 +0100
+
 flint (2.5.2-12) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 29abdc8..82ee324 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Julien Puydt <julien.puydt at laposte.net>
 Homepage: http://www.flintlib.org/
-Build-Depends: debhelper (>= 10), libgmp-dev, libmpfr-dev, libntl-dev (>= 9.9.1), texlive-latex-extra, texlive-fonts-recommended
+Build-Depends: debhelper (>= 10), gcc-5 [mips mipsel], g++-5 [mips mipsel], libgmp-dev, libmpfr-dev, libntl-dev (>= 9.9.1), texlive-latex-extra, texlive-fonts-recommended
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/flint.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/flint.git
diff --git a/debian/rules b/debian/rules
index 9c5ed84..c39d835 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,12 @@ ifeq ($(DEB_HOST_ARCH_CPU),i386)
 export DEB_CFLAGS_MAINT_APPEND = -ansi
 endif
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 # FTBFS on mips and mipsel seems to be caused by PIE.
 ifeq ($(DEB_HOST_ARCH_CPU), $(filter $(DEB_HOST_ARCH_CPU), mips mipsel))
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+  export CC = gcc-5  
+  export CXX = g++-5
 endif
 
 %:

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