[med-svn] [parsnp] 01/01: drop -m64

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository parsnp.

commit 9f7ea6bd00385f8cde4b0747f30a07e63fa17bd0
Author: Sascha Steinbiss <satta at debian.org>
Date:   Tue Oct 11 17:51:52 2016 +0000

    drop -m64
---
 debian/changelog              | 13 +++++++++++--
 debian/patches/drop_m64.patch | 17 +++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0514f9..209a958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-parsnp (1.2+dfsg-2) UNRELEASED; urgency=medium
+parsnp (1.2+dfsg-2) unstable; urgency=medium
 
+  * Team upload.
+
+  [ Andreas Tille ]
   * Add copyright statement at ftpmaster request
 
- -- Andreas Tille <tille at debian.org>  Fri, 16 Sep 2016 23:17:36 +0200
+  [ Sascha Steinbiss ]
+  * Drop -m64 from CXXFLAGS.
+    This addresses FTBFS on 32-bit systems. Thanks to Aaron M. Ucko for
+    the hint.
+    Closes: #838174
+
+ -- Sascha Steinbiss <satta at debian.org>  Tue, 11 Oct 2016 17:00:18 +0000
 
 parsnp (1.2+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/patches/drop_m64.patch b/debian/patches/drop_m64.patch
new file mode 100644
index 0000000..d3b1de5
--- /dev/null
+++ b/debian/patches/drop_m64.patch
@@ -0,0 +1,17 @@
+Description: drop -m64
+Author: Sascha Steinbiss <satta at debian.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,3 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = src 
+-AM_CXXFLAGS = -O3 -m64 -fopenmp -funroll-all-loops -fomit-frame-pointer -ftree-vectorize
++AM_CXXFLAGS = -O3 -fopenmp -funroll-all-loops -fomit-frame-pointer -ftree-vectorize
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-parsnp_CXXFLAGS = -O3 -m64 -fopenmp -funroll-all-loops -fomit-frame-pointer -ftree-vectorize 
++parsnp_CXXFLAGS = -O3 -fopenmp -funroll-all-loops -fomit-frame-pointer -ftree-vectorize 
+ parsnp_LDFLAGS = -lgomp -lstdc++ -lpthread -std=gnu++0x -L$(libmuscle)/lib -lMUSCLE-3.7 
+ bin_PROGRAMS = parsnp
+ parsnp_SOURCES = MuscleInterface.cpp MuscleInterface.h parsnp.cpp parsnp.hh LCB.cpp LCB.hh LCR.cpp LCR.hh TMum.cpp TMum.hh Converter.cpp Converter.hh ./ext/iniFile.cpp ./ext/iniFile.h 
diff --git a/debian/patches/series b/debian/patches/series
index 9e77cc9..a78dd62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ avoid_rpath.patch
 add_missing_interpreter_line.patch
 proper_calls_to_tools.patch
 # debug.patch
+drop_m64.patch

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