[med-svn] r21636 - trunk/packages/seer/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2016-04-01 06:27:43 +0000 (Fri, 01 Apr 2016)
New Revision: 21636

Added:
   trunk/packages/seer/trunk/debian/patches/pthread_versus_hardening.patch
Modified:
   trunk/packages/seer/trunk/debian/patches/series
Log:
Fix hardening


Added: trunk/packages/seer/trunk/debian/patches/pthread_versus_hardening.patch
===================================================================
--- trunk/packages/seer/trunk/debian/patches/pthread_versus_hardening.patch	                        (rev 0)
+++ trunk/packages/seer/trunk/debian/patches/pthread_versus_hardening.patch	2016-04-01 06:27:43 UTC (rev 21636)
@@ -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)
+ 

Modified: trunk/packages/seer/trunk/debian/patches/series
===================================================================
--- trunk/packages/seer/trunk/debian/patches/series	2016-03-31 20:41:58 UTC (rev 21635)
+++ trunk/packages/seer/trunk/debian/patches/series	2016-04-01 06:27:43 UTC (rev 21636)
@@ -1,2 +1,3 @@
 fix_lib_location.patch
 hardening.patch
+pthread_versus_hardening.patch