[med-svn] r17771 - trunk/packages/mapsembler2/trunk/debian/patches

[Olivier Sallou]

Author: osallou
Date: 2014-08-18 17:37:10 +0000 (Mon, 18 Aug 2014)
New Revision: 17771

Modified:
   trunk/packages/mapsembler2/trunk/debian/patches/add_hardening
Log:
fix cflag for hardening

Modified: trunk/packages/mapsembler2/trunk/debian/patches/add_hardening
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/patches/add_hardening	2014-08-18 17:11:41 UTC (rev 17770)
+++ trunk/packages/mapsembler2/trunk/debian/patches/add_hardening	2014-08-18 17:37:10 UTC (rev 17771)
@@ -2,7 +2,7 @@
 ===================================================================
 --- mapsembler2_pipeline.orig/kissreads/Makefile
 +++ mapsembler2_pipeline/kissreads/Makefile
-@@ -20,11 +20,15 @@ CC		=gcc
+@@ -20,10 +20,14 @@ CC		=gcc
  # optimized flags
  
  #CFLAGS=-Wall -O3 -lz -fopenmp -DOMP #openmp is incompatiblre with clang #@!§
@@ -10,15 +10,15 @@
 +#CFLAGS= -O3 -lz -fopenmp -DOMP #openmp is incompatiblre with clang #@!
  CFLAGS+=$(MYFLAGS)
  #LDFLAGS+=-Wall -lm -O3 -lz -DOMP -fopenmp#-fopenmp
- LDFLAGS+= -lm -O3 -lz -DOMP -fopenmp#-fopenmp
+-LDFLAGS+= -lm -O3 -lz -DOMP -fopenmp#-fopenmp
++#LDFLAGS+= -lm -O3 -lz -DOMP -fopenmp#-fopenmp
++
++CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -O3 -lz
++LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -lm -O3 -lz
  
-+CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
-+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-+
  ## debug flags
  
- 
 Index: mapsembler2_pipeline/kissreads_graph/makefile
 ===================================================================
 --- mapsembler2_pipeline.orig/kissreads_graph/makefile