[med-svn] [parafly] 01/03: Inject (simplified) patch from Arturo Borrero Gonzalez

[Andreas Tille]

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

tille pushed a commit to branch master
in repository parafly.

commit 132608c637aea9c46760db6528533f668dec9f15
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jun 25 21:48:37 2015 +0200

    Inject (simplified) patch from Arturo Borrero Gonzalez
---
 debian/changelog         |  9 +++++++++
 debian/control           |  3 ++-
 debian/patches/m64.patch | 23 +++++++++++++++++++++++
 debian/patches/series    |  1 +
 debian/rules             | 10 +++++++++-
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f61c0b..b952545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+parafly (0.0.2013.01.21-2) UNRELEASED; urgency=medium
+
+  * Team upload
+  * patch to avoid -m64 flag (Thanks to Arturo Borrero Gonzalez
+    <arturo.borrero.glez at gmail.com>)
+    Closes: #786995
+
+ -- Andreas Tille <tille at debian.org>  Thu, 25 Jun 2015 21:49:20 +0200
+
 parafly (0.0.2013.01.21-1) unstable; urgency=low
 
   * Initial release (Closes: #778331)
diff --git a/debian/control b/debian/control
index ff392ca..2ad5170 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Uploaders: Michael R. Crusoe <mcrusoe at msu.edu>
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               autotools-dev
+               autotools-dev,
+               dh-autoreconf
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/parafly.git
 Vcs-Git: git://anonscm.debian.org/debian-med/parafly.git
diff --git a/debian/patches/m64.patch b/debian/patches/m64.patch
new file mode 100644
index 0000000..00d20c4
--- /dev/null
+++ b/debian/patches/m64.patch
@@ -0,0 +1,23 @@
+Description: get rid of mandatory m64 compiler flag
+ This patch gets rid of the mandatory '-m64' compiler flag which
+ makes parafly FTBFS on non-64bits arches.
+ There is need to ensure 'Makefile' and 'configure' files are
+ generated at build time for the flag to don't appear again.
+ .
+ This was tested on mipsel; other arches may benefit as well.
+Author: Arturo Borrero Gonzalez <arturo.borrero.glez at gmail.com>
+Bug-Debian: https://bugs.debian.org/786995
+Forwarded: not-needed
+Last-Update: 2015-06-25
+
+--- parafly-0.0.2013.01.21.orig/configure.ac
++++ parafly-0.0.2013.01.21/configure.ac
+@@ -3,7 +3,7 @@ AM_INIT_AUTOMAKE([foreign -Wall -Werror]
+ AC_LANG([C++])
+ AC_PROG_CXX
+ #AC_OPENMP # requires autoconf >= 2.62
+-AC_SUBST([AM_CXXFLAGS], [-m64])
++AC_SUBST([AM_CXXFLAGS], [])
+ case $CXX in
+   g++*) AC_SUBST([AM_CXXFLAGS],["-pedantic -fopenmp -Wall -Wextra -Wno-long-long -Wno-deprecated $AM_CXXFLAGS"]);;
+   sunCC*) AC_SUBST([AM_CXXFLAGS], ["-library=stlport4 -xopenmp -xvpara -fast $AM_CXXFLAGS"]) ;;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7665744
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+m64.patch
diff --git a/debian/rules b/debian/rules
index bccaaa6..da54486 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,14 @@
 
 DH_VERBOSE := 1
 
+SAVEAUTO=debian/save_autoconf
+
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autoreconf,autotools_dev
 
+override_dh_auto_clean:
+	mkdir -p $(SAVEAUTO)
+	mv Makefile configure config.log config.status $(SAVEAUTO)
+	dh_auto_clean
+	mv $(SAVEAUTO)/* .
+	rm -rf $(SAVEAUTO)

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