[med-svn] [seq-gen] 02/05: Introduce patch fixing makefile, enable hardening flags in d/rules

[Alex Mestiashvili]

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

malex-guest pushed a commit to branch master
in repository seq-gen.

commit ae55297e19138402ac1bb9cc061c7baec0082128
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Thu Sep 7 10:37:00 2017 +0200

    Introduce patch fixing makefile, enable hardening flags in d/rules
---
 debian/patches/makefile_vars.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  3 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/patches/makefile_vars.patch b/debian/patches/makefile_vars.patch
new file mode 100644
index 0000000..7f3aa5b
--- /dev/null
+++ b/debian/patches/makefile_vars.patch
@@ -0,0 +1,30 @@
+From: Alex Mestiashvili <mailatgoogl at gmail.com>
+Description: Introduce LDFLAGS and CPPFLAGS, remove hardcoded values for CFLAGS
+--- seq-gen.orig/source/Makefile
++++ seq-gen/source/Makefile
+@@ -5,14 +5,12 @@
+ 
+ LIBS = $(CLIBS)
+ 
+-CFLAGS = -O3
+-
+ OBJ = seq-gen.o global.o evolve.o model.o nucmodels.o aamodels.o eigen.o treefile.o progress.o gamma.o twister.o
+ 
+ .SUFFIXES: .o .c .h
+ 
+ .c.o:
+-	$(CLINKER) $(CFLAGS) -c $*.c 
++	$(CLINKER) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -c $*.c 
+ 
+ dummy:	default
+ 
+@@ -24,7 +22,7 @@
+ all: seq-gen
+ 
+ seq-gen: $(OBJ)
+-	$(CLINKER) $(CFLAGS) -o seq-gen $(OBJ) $(LIBS)
++	$(CLINKER) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o seq-gen $(OBJ) $(LIBS)
+ 
+ %.o: %.c %.h
+-	$(CLINKER) $(CFLAGS) -c $<
++	$(CLINKER) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -c $<
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..befd38b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+makefile_vars.patch
diff --git a/debian/rules b/debian/rules
index 2f37063..1157ec3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# This has to be exported to make some magic below work.
 export DH_OPTIONS
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --sourcedirectory=source
 
 override_dh_clean:
+	echo $(CFLAGS)
 	[ ! -f source/seq-gen ] || rm source/seq-gen
 	dh_clean
 

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