[med-svn] [seer] 06/13: Hardening patch does not really work - no idea why (leave this for a later point in time)

[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 0e8d8d0983e9685bd38e67b626eb3a07b32937d8
Author: Andreas Tille <tille at debian.org>
Date:   Thu Mar 31 20:41:58 2016 +0000

    Hardening patch does not really work - no idea why (leave this for a later point in time)
---
 debian/patches/hardening.patch | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..a667367
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,39 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 29 Mar 2016 19:32:29 +0200
+Description: Propagate hardening options
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,11 +13,11 @@ BINDIR=$(PREFIX)/bin
+ # gcc
+ CXXFLAGS+=-Wall -O3 -std=c++11
+ SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas $(LDFLAGS)
+-MAP_LDLIBS=-L$(PREFIX)/lib -lboost_program_options
+-COMBINE_LDLIBS=-lgzstream -lz -lboost_program_options
+-FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options
++MAP_LDLIBS=-lboost_program_options $(LDFLAGS)
++COMBINE_LDLIBS=-lgzstream -lz -lboost_program_options $(LDFLAGS)
++FILTER_LDLIBS=-lboost_program_options $(LDFLAGS)
+ 
+-CPPFLAGS=-I$(PREFIX)/include -I../gzstream -I../dlib -D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1
++CPPFLAGS+=-I$(PREFIX)/include -I../gzstream -I../dlib -D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1
+ 
+ # For static linking. To use type 'make static'
+ # Requires icpc and mkl
+@@ -56,13 +56,13 @@ kmds: $(KMDS_OBJECTS)
+ 	$(LINK.cpp) $^ $(SEER_LDLIBS) -o $@
+ 
+ map_back: $(MAP_OBJECTS)
+-	$(LINK.cpp) $^ $(MAP_LDLIBS) -o $@
++	$(LINK.cpp) $^ $(MAP_LDLIBS) $(LDFLAGS) -o $@
+ 
+ combineKmers: $(COMBINE_OBJECTS)
+-	$(LINK.cpp) $^ $(COMBINE_LDLIBS) -o $@
++	$(LINK.cpp) $^ $(COMBINE_LDLIBS) $(LDFLAGS) -o $@
+ 
+ filter_seer: $(FILTER_OBJECTS)
+-	$(LINK.cpp) $^ $(FILTER_LDLIBS) -o $@
++	$(LINK.cpp) $^ $(FILTER_LDLIBS) $(LDFLAGS) -o $@
+ 
+ seer_static: $(SEER_OBJECTS)
+ 	$(LINK.cpp) $^ $(SEER_STATIC_LDLIBS) -o $@

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