1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
|
Subject: add Debian hardening flags
Description: add hardening
Author: Olivier Sallou <osallou@debian.org>
Last-Updated: 2014-08-18
Forwarded: no
--- a/kissreads/Makefile
+++ b/kissreads/Makefile
@@ -25,6 +25,10 @@ CFLAGS+=$(MYFLAGS)
#LDFLAGS+=-Wall -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
+
## debug flags
--- a/kissreads_graph/makefile
+++ b/kissreads_graph/makefile
@@ -6,6 +6,9 @@ CFLAGS= -O3 -L../thirdparty/zlib/build
#CFLAGS= -g -L../thirdparty/zlib/build -lz -std=c++11 -DMINIA_IS_IN_PARENT_FOLDER
#CFLAGS= -g -L../thirdparty/zlib/build -lz -DMINIA_IS_IN_PARENT_FOLDER
CFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -O3 -lz -DMINIA_IS_IN_PARENT_FOLDER -D_FILE_OFFSET_BITS=64
+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 ReadMapper.cpp
OBJ= $(SRC:.cpp=.o)
all: $(EXEC)
@@ -49,7 +52,7 @@ endif
all: $(EXEC)
kissreads_graph: $(OBJ) KissReadsGraph.cpp
- $(CC) -o $@ $^ $(CFLAGS)
+ $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
%.o: %.cpp %.h
$(CC) -o $@ -c $< $(CFLAGS)
--- a/mapsembler2_extend/makefile
+++ b/mapsembler2_extend/makefile
@@ -51,6 +51,11 @@ else
endif
endif
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+
+
SRC=../minia/Pool.cpp ../minia/Bank.cpp ../minia/Bloom.cpp ../minia/Hash16.cpp ../minia/Terminator.cpp ../minia/Kmer.cpp ../minia/Traversal.cpp ../minia/LinearCounter.cpp ../minia/Set.cpp ../minia/Utils.cpp ../minia/SortingCount.cpp ../minia/Debloom.cpp ../minia/OAHash.cpp commons.cpp IterativeExtensions.cpp Fragment_Bank.cpp Fragment.cpp GraphOutput.cpp
OBJ= $(SRC:.cpp=.o)
all: $(EXEC)
@@ -105,7 +110,7 @@ all: $(EXEC)
mapsembler_extend: $(OBJ) $(OBJ2) mapsembler_extend.cpp
#mapsembler: $(OBJ) $(OBJ2) test.cpp
- $(CC) -o $@ $^ $(CFLAGS)
+ $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
%.o: %.cpp %.h
$(CC) -o $@ -c $< $(CFLAGS)
--- a/mapsembler2_extremities/CMakeLists.txt
+++ b/mapsembler2_extremities/CMakeLists.txt
@@ -2,6 +2,7 @@ project(mapsembler2_extremities)
cmake_minimum_required(VERSION 2.6)
+
################################################################################
# Define cmake modules directory
################################################################################
|