[med-svn] r15566 - in trunk/packages/primer3/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-12-19 09:43:15 +0000 (Thu, 19 Dec 2013)
New Revision: 15566

Added:
   trunk/packages/primer3/trunk/debian/patches/
   trunk/packages/primer3/trunk/debian/patches/hardening.patch
   trunk/packages/primer3/trunk/debian/patches/series
Modified:
   trunk/packages/primer3/trunk/debian/changelog
Log:
Propagate hardening options


Modified: trunk/packages/primer3/trunk/debian/changelog
===================================================================
--- trunk/packages/primer3/trunk/debian/changelog	2013-12-19 09:05:31 UTC (rev 15565)
+++ trunk/packages/primer3/trunk/debian/changelog	2013-12-19 09:43:15 UTC (rev 15566)
@@ -9,6 +9,7 @@
   [ Andreas Tille ]
   * Fix watch file
   * replace cdbs by dh
+  * debian/patches/hardening.patch: Propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Thu, 19 Dec 2013 09:58:19 +0100
 

Added: trunk/packages/primer3/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/primer3/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/primer3/trunk/debian/patches/hardening.patch	2013-12-19 09:43:15 UTC (rev 15566)
@@ -0,0 +1,26 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 19 Dec 2013 09:58:19 +0100
+Description: Propagate hardening options
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -59,8 +59,8 @@ O_OPTS     = -O2
+ CC_OPTS    = -g -Wall -D__USE_FIXED_PROTOTYPES__
+ P_DEFINES  =
+ 
+-CFLAGS  = $(CC_OPTS) $(O_OPTS)
+-LDFLAGS = -g
++CFLAGS  += $(CC_OPTS) $(O_OPTS)
++LDFLAGS += -g
+ # Note, for profiling, use
+ # make O_OPTS='-pg -O0' LDFLAGS='-g -pg'
+ 
+@@ -163,7 +163,7 @@ $(NTTHAL_EXE): thal_main.o thal.o
+ 	$(CPP) $(LDFLAGS) -o $@ thal_main.o thal.o $(LDLIBS)
+ 
+ $(OLIGOTM_EXE): oligotm_main.c oligotm.h $(LIBOLIGOTM)
+-	$(CPP) $(CFLAGS) -o $@ oligotm_main.c $(LIBOLIGOTM) $(LIBOPTS) $(LDLIBS)
++	$(CPP) $(CFLAGS) $(LDFLAGS) -o $@ oligotm_main.c $(LIBOLIGOTM) $(LIBOPTS) $(LDLIBS)
+ 
+ $(LONG_SEQ_EXE): long_seq_tm_test_main.c oligotm.o
+ 	$(CPP) $(CFLAGS) -o $@ long_seq_tm_test_main.c oligotm.o $(LIBOPTS) $(LDLIBS)

Added: trunk/packages/primer3/trunk/debian/patches/series
===================================================================
--- trunk/packages/primer3/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/primer3/trunk/debian/patches/series	2013-12-19 09:43:15 UTC (rev 15566)
@@ -0,0 +1 @@
+hardening.patch