[med-svn] [parsnp] 01/04: Fix build when trying to link with -Wl, --as-needed

[Andreas Tille]

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

tille pushed a commit to branch master
in repository parsnp.

commit 8285defcec1848e574e8068e681c64954c6a246b
Author: Andreas Tille <tille at debian.org>
Date:   Wed Nov 23 20:06:36 2016 +0100

    Fix build when trying to link with -Wl, --as-needed
---
 debian/changelog                              |  8 ++++++++
 debian/patches/fix_build_with_as-needed.patch | 17 +++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 209a958..83c0521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+parsnp (1.2+dfsg-3) UNRELEASED; urgency=medium
+
+  * Fix build when trying to link with -Wl, --as-needed (Thanks for the patch
+    to Graham Inggs <ginggs at debian.org>)
+    Closes: #845415
+
+ -- Andreas Tille <tille at debian.org>  Wed, 23 Nov 2016 20:05:33 +0100
+
 parsnp (1.2+dfsg-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix_build_with_as-needed.patch b/debian/patches/fix_build_with_as-needed.patch
new file mode 100644
index 0000000..b1955f3
--- /dev/null
+++ b/debian/patches/fix_build_with_as-needed.patch
@@ -0,0 +1,17 @@
+Description: Fix build with -Wl,--as-needed
+ Move -std=gnu++0x to CXXFLAGS and add libraries
+ in LIBS instead of LDFLAGS.
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2016-11-23
+Bug-Debian: https://bugs.debian.org/845415
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,5 @@
+-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 
++parsnp_CXXFLAGS = -O3 -fopenmp -funroll-all-loops -fomit-frame-pointer -ftree-vectorize -std=gnu++0x
++LIBS = -lgomp -lstdc++ -lpthread -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 
+ bindir = $(prefix)/bin
diff --git a/debian/patches/series b/debian/patches/series
index a78dd62..268d1cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ add_missing_interpreter_line.patch
 proper_calls_to_tools.patch
 # debug.patch
 drop_m64.patch
+fix_build_with_as-needed.patch

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