[med-svn] [seer] 07/13: Fix hardening

[Andreas Tille]

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

tille pushed a commit to branch master
in repository seer.

commit 7979f8830a74a9cef6c5f98879f59f706bf7136e
Author: Andreas Tille <tille at debian.org>
Date:   Fri Apr 1 06:27:43 2016 +0000

    Fix hardening
---
 debian/patches/pthread_versus_hardening.patch | 20 ++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/pthread_versus_hardening.patch b/debian/patches/pthread_versus_hardening.patch
new file mode 100644
index 0000000..e0864a4
--- /dev/null
+++ b/debian/patches/pthread_versus_hardening.patch
@@ -0,0 +1,20 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 29 Mar 2016 19:32:29 +0200
+Description: Set -pthread inside Makefile
+ When doing this in debian/rules via
+   export LDFLAGS := -pthread $(LDFLAGS)
+ the hardening options are overriden
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -12,8 +12,8 @@ BINDIR=$(PREFIX)/bin
+ #FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options -mkl
+ # gcc
+ CXXFLAGS+=-Wall -O3 -std=c++11
+-SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas $(LDFLAGS)
+-MAP_LDLIBS=-lboost_program_options $(LDFLAGS)
++SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas -pthread $(LDFLAGS)
++MAP_LDLIBS=-lboost_program_options -pthread $(LDFLAGS)
+ COMBINE_LDLIBS=-lgzstream -lz -lboost_program_options $(LDFLAGS)
+ FILTER_LDLIBS=-lboost_program_options $(LDFLAGS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 797e2d5..9762ec0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_lib_location.patch
 hardening.patch
+pthread_versus_hardening.patch

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