Subject: Add hardening
Description: makefiles do not import default CFLAGS,...
this patch add debian cflags for hardening
Forwarded: no
Author: Olivier Sallou <osallou@debian.org>
Last-Updated: 2014-02-01
--- a/minia/makefile
+++ b/minia/makefile
@@ -1,5 +1,9 @@
 CC=g++
-CFLAGS = -O4
+
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -O4
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 SRC=Pool.cpp Bank.cpp Bloom.cpp Hash16.cpp LargeInt.cpp Kmer.cpp Terminator.cpp Traversal.cpp LinearCounter.cpp Set.cpp Utils.cpp SortingCount.cpp Debloom.cpp OAHash.cpp
 EXEC=minia
 OBJ= $(SRC:.cpp=.o)
@@ -60,7 +64,7 @@
 all: $(EXEC)
 
 minia: clean $(OBJ) Minia.cpp
-	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) -lz
+	$(CC) -o $@ $(OBJ) Minia.cpp $(CFLAGS) $(LDFLAGS) -lz
 
 %.o: %.cpp %.h
 	$(CC) -o $@ -c $< $(CFLAGS)
--- a/maps/makefile
+++ b/maps/makefile
@@ -1,7 +1,10 @@
 CC=g++ 
 EXEC=mapsembler
 #CFLAGS=  -O4 -lz --std=gnu++0x
-CFLAGS=  -g -lz -DMINIA_IS_IN_PARENT_FOLDER
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -g -lz -DMINIA_IS_IN_PARENT_FOLDER
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 #CFLAGS=  -O3 -lz -DMINIA_IS_IN_PARENT_FOLDER
 #CFLAGS=  -g -lz --std=gnu++0x -DMINIA_IS_IN_PARENT_FOLDER
 #CFLAGS=  -g -lz -DMINIA_IS_IN_PARENT_FOLDER
@@ -49,7 +52,7 @@
 
 mapsembler:  $(OBJ) $(OBJ2) mapsembler.cpp
 #mapsembler:  $(OBJ) $(OBJ2) test.cpp
-	$(CC) -o $@ $^ $(CFLAGS) 
+	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
 
 %.o: %.cpp %.h 
 	$(CC) -lz -o $@ -c $< $(CFLAGS)
--- a/kissreads_g/makefile
+++ b/kissreads_g/makefile
@@ -4,7 +4,9 @@
 #Loader.cpp CFLAGS=  -g -lz -std=c++11 -DMINIA_IS_IN_PARENT_FOLDER
 #Loader.cpp 
 #CFLAGS=  -O3 -lz -DMINIA_IS_IN_PARENT_FOLDER
-CFLAGS=  -g -lz -DMINIA_IS_IN_PARENT_FOLDER
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -g -lz -DMINIA_IS_IN_PARENT_FOLDER
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 SRC=block_allocator.cpp  DeBruijnGraph.cpp  Fragment.cpp  json.cpp  read_coherence_mapsembler/libchash.cpp     read_coherence_mapsembler/couple.cpp  read_coherence_mapsembler/misc_tools.cpp  read_coherence_mapsembler/read_groups.cpp read_coherence_mapsembler/consensus_common.cpp  read_coherence_mapsembler/list.cpp    read_coherence_mapsembler/read_coherence.cpp  read_coherence_mapsembler/interface_libchash.cpp commons.cpp ../minia/Kmer.cpp ../minia/Bank.cpp Loader.cpp BooleanVector.cpp ReadMapper.cpp
 OBJ= $(SRC:.cpp=.o) 
 all: $(EXEC)
@@ -48,7 +50,7 @@
 all: $(EXEC)
 
 kissreads_graph:  $(OBJ) KissReadsGraph.cpp
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
 
 %.o: %.cpp %.h
 	$(CC) -lz -o $@ -c $< $(CFLAGS)
