[med-svn] [dnaclust] 02/02: Care for hardening options

[Andreas Tille]

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

tille pushed a commit to branch master
in repository dnaclust.

commit 3fff9e0eddec8143585aafa34449cbd56af2b869
Author: Andreas Tille <tille at debian.org>
Date:   Sat Feb 1 18:10:31 2014 +0100

    Care for hardening options
---
 debian/patches/do_not_staically_linking.patch | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/patches/do_not_staically_linking.patch b/debian/patches/do_not_staically_linking.patch
index f0b805c..0b7ad53 100644
--- a/debian/patches/do_not_staically_linking.patch
+++ b/debian/patches/do_not_staically_linking.patch
@@ -1,13 +1,35 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Sat, 01 Feb 2014 17:10:29 +0100
-Description: Prevent static linking
+Description: Prevent static linking and propagate hardening options
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,24 +1,24 @@
  #PROFILE_FLAGS = -pg -fprofile-arcs -ftest-coverage -g -O1
 -CXXFLAGS = -Wall -pedantic -std=c++98 -O2 -static
 +CXXFLAGS += -Wall -pedantic -std=c++98 -O2
  CXX = g++ 
  #-DCHRIS_DEBUG
  
+ all: dnaclust fastaselect fastasort
+ 
+ dnaclust: dnaclust.o fasta.o
+-	$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) dnaclust.o fasta.o -lboost_program_options -o $@ -lpthread
++	$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) $(LDFLAGS) dnaclust.o fasta.o -lboost_program_options -o $@ -lpthread
+ 
+ dnaclust.o: dnaclust.cpp search_include.cpp utility.hpp ternary_sort.hpp multi_dim.hpp
+ 	$(CXX) -c $(CXXFLAGS) $(PROFILE_FLAGS) dnaclust.cpp
+ 
+ fastaselect: fastaselect.o fasta.o
+-	$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) fastaselect.o fasta.o -lboost_program_options -o $@
++	$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) $(LDFLAGS) fastaselect.o fasta.o -lboost_program_options -o $@
+ 
+ fastaselect.o: fastaselect.cpp
+ 	$(CXX) -c $(CXXFLAGS) $(PROFILE_FLAGS) fastaselect.cpp
+ 
+ fastasort: fastasort.o fasta.o
+-	$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) $+ -lboost_program_options -o $@
++	$(CXX) $(CXXFLAGS) $(PROFILE_FLAGS) $(LDFLAGS) $+ -lboost_program_options -o $@
+ 
+ fastasort.o: fastasort.cpp
+ 	$(CXX) -c $(CXXFLAGS) $(PROFILE_FLAGS) $+ -o $@

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/dnaclust.git