Subject: add fortify flags
Description: Makefile does not load CFLAGS
 from env, add extra flags for debian fortify
Forwarded: no
Author: Olivier Sallou <osallou@debian.org>
Last-Updated: 2013-02-09
--- a/standardPregraph/Makefile
+++ b/standardPregraph/Makefile
@@ -12,7 +12,11 @@
 CFLAGS=         -O0 -g -fomit-frame-pointer #-static #-mcrc32 -march=core2 -msse4.1 -msse4.2
 else
 CFLAGS=         -O4 -fomit-frame-pointer #-static #-mcrc32 -march=core2 -msse4.1 -msse4.2
+CFLAGS+= `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
+CFLAGS+=$(HARDENING_CFLAGS)
 endif
+LDFLAGS= `dpkg-buildflags --get LDFLAGS`
+LDFLAGS+=$(HARDENING_LDFLAGS)
 DFLAGS=         
 OBJS=		arc.o attachPEinfo.o bubble.o check.o compactEdge.o \
 		concatenateEdge.o connect.o contig.o cutTipPreGraph.o cutTip_graph.o \
@@ -87,9 +91,10 @@
 		@test $(GCCVERSIONMAJOR) == 1 || sh -c 'echo "GCC version lower than 4.4.0";false;'
 		@test $(GCCVERSIONMINOR) == 1 || sh -c 'echo "GCC version lower than 4.4.0";false;'
 
-SOAPdenovo:	envTest $(OBJS)
+#SOAPdenovo:	envTest $(OBJS)
+SOAPdenovo:
 		@printf "Linking...                                                \r"
-		@$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LIBPATH) $(LIBS) $(ENTRAFLAGS)
+		@$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBPATH) $(LIBS) $(ENTRAFLAGS)
 		@printf "$(PROG) compilation done.\n";
 
 clean:
--- a/sparsePregraph/Makefile
+++ b/sparsePregraph/Makefile
@@ -3,7 +3,11 @@
 CFLAGS=         -O0 -g -fomit-frame-pointer #-static #-mcrc32 -march=core2 -msse4.1 -msse4.2
 else
 CFLAGS=         -O4 -fomit-frame-pointer #-static #-mcrc32 -march=core2 -msse4.1 -msse4.2
+CFLAGS+= `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
+CFLAGS+=$(HARDENING_CFLAGS)
 endif
+LDFLAGS= `dpkg-buildflags --get LDFLAGS`
+LDFLAGS+=$(HARDENING_LDFLAGS)
 
 DFLAGS=         
 OBJS=		build_graph.o build_edge.o multi_threads.o \
@@ -74,7 +78,7 @@
 
 pregraph_sparse: clean	envTest $(OBJS)
 		@printf "Linking...                                                       \r"
-		#@$(CC) $(CFLAGS)$(INCLUDES) -o $(PROG)  $(OBJS) $(LIBPATH) $(LIBS) $(ENTRAFLAGS)
+		#@$(CC) $(LDFLAGS) $(CFLAGS)$(INCLUDES) -o $(PROG)  $(OBJS) $(LIBPATH) $(LIBS) $(ENTRAFLAGS)
 		@printf "$(PROG) compilation done.\n";
 
 clean:
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,13 @@
 CFLAGS=         -O0 -g -fomit-frame-pointer
 else
 CFLAGS=         -O4 -fomit-frame-pointer
+CFLAGS+= `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
+CFLAGS+=$(HARDENING_CFLAGS)
 endif
 
+LDFLAGS= `dpkg-buildflags --get LDFLAGS`
+LDFLAGS+=$(HARDENING_LDFLAGS)
+
 SUBDIRS = sparsePregraph standardPregraph
 PROG=       SOAPdenovo-63mer SOAPdenovo-127mer
 INCLUDES=   -I./sparsePregraph/inc -I./standardPregraph/inc -I/usr/include/x86_64-linux-gnu
@@ -64,11 +69,11 @@
 SOAPdenovo-63mer:
 	@cd sparsePregraph;make 63mer=1;cd ..;
 	@cd standardPregraph;make 63mer=1;cd ..;
-	@$(CC) sparsePregraph/*.o standardPregraph/*.o $(LIBPATH) $(LIBS) $(EXTRA_FLAGS) -o SOAPdenovo-63mer
+	@$(CC) sparsePregraph/*.o standardPregraph/*.o $(LDFLAGS) $(LIBPATH) $(LIBS) $(EXTRA_FLAGS) -o SOAPdenovo-63mer
 SOAPdenovo-127mer:
 	@cd sparsePregraph;make 127mer=1;cd ..;
 	@cd standardPregraph;make 127mer=1;cd ..;
-	@$(CC) sparsePregraph/*.o standardPregraph/*.o $(LIBPATH) $(LIBS) $(EXTRA_FLAGS) -o SOAPdenovo-127mer
+	@$(CC) sparsePregraph/*.o standardPregraph/*.o $(LDFLAGS) $(LIBPATH) $(LIBS) $(EXTRA_FLAGS) -o SOAPdenovo-127mer
 clean:
 	@cd sparsePregraph;make clean;cd ..;
 	@cd standardPregraph;make clean;cd ..;
