[med-svn] [aghermann] 31/34: debian: carefully select g++ version (maintainer version -2)

[andrei zavada]

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

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 08f55f26ccad2a143c166c58a2fdcbd0a9345ae8
Author: Andrei Zavada <hmmr at ra>
Date:   Sat Nov 23 02:41:20 2013 +0200

    debian: carefully select g++ version (maintainer version -2)
---
 debian/changelog |  8 ++++++++
 debian/control   |  2 +-
 debian/rules     | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c443b2e..2804068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+aghermann (1.0-2) unstable; urgency=low
+
+  * Mention g++ in Build-Depends, with version constrains (>= 4.7).
+  * Use best available g++ (4.7 or better) if g++ defaults to g++-4.6.
+    - fix build on ia64, powerpc, s390x, sparc, ppc64, sh4 (Closes: #729876).
+
+ -- Andrei Zavada <johnhommer at gmail.com>  Tue, 19 Nov 2013 23:47:05 +0200
+
 aghermann (1.0-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index a19bd46..1ba55a7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: aghermann
 Section: science
 Priority: optional
 Maintainer: Andrei Zavada <johnhommer at gmail.com>
-Build-Depends: debhelper (>= 9), dh-autoreconf, hardening-wrapper, hardening-includes, autoconf-archive, pkg-config, libgomp1, libconfig++-dev, libgsl0-dev, libfftw3-dev, libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.90-dev, liblua5.2-dev, lua5.2, libxml2-utils
+Build-Depends: debhelper (>= 9), dh-autoreconf, hardening-wrapper, hardening-includes, autoconf-archive, g++ (>= 4:4.7~) | g++-4.7 | g++-4.8, pkg-config, libgomp1, libconfig++-dev, libgsl0-dev, libfftw3-dev, libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.90-dev, liblua5.2-dev, lua5.2, libxml2-utils
 Standards-Version: 3.9.4
 Homepage: http://johnhommer.com/academic/code/aghermann
 Vcs-Git: git://git.debian.org/git/debian-med/aghermann.git
diff --git a/debian/rules b/debian/rules
index 3d63ecf..a21a561 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,19 @@ LDFLAGS+=$(HARDENING_LDFLAGS)
 
 %:
 	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+# Take care to select an appropriate version of gcc
+	for v in 4.8 4.7; do \
+	  g=`which g++-$$v`; \
+	  if test -n "$$g"; then \
+	    $$g >/dev/null 2>&1; \
+	    if [ $$? != 127 ]; then export CXX=`which g++-$$v`; break; fi \
+	  fi \
+	done; \
+	autoreconf -f && \
+	./configure --prefix=/usr
+
+override_dh_clean:
+	rm -f config.log
+	dh_clean

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git