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
|
Description: inject CPPFLAGS in compiler invocations.
Among other things, this allows the propagation of source fortification macro.
Author: Étienne Mollier <emollier@debian.org>
Forwarded: not-needed
Last-Update: 2023-11-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- flye.orig/src/Makefile
+++ flye/src/Makefile
@@ -13,7 +13,7 @@
release: CXXFLAGS += -O3 -DNDEBUG
release: flye-modules
-SANITIZE_FLAGS += -D_GLIBCXX_SANITIZE_VECTOR -U_FORTIFY_SOURCE -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+SANITIZE_FLAGS += -D_GLIBCXX_SANITIZE_VECTOR -U_FORTIFY_SOURCE=2 -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
#SANITIZE_FLAGS += -fsanitize=thread -fsanitize=leak -fsanitize=undefined
debug: CXXFLAGS += -Og ${SANITIZE_FLAGS}
#debug: CXXFLAGS += -D_GLIBCXX_DEBUG
@@ -25,32 +25,32 @@
sequence_obj := ${patsubst %.cpp,%.o,${wildcard sequence/*.cpp}}
sequence/%.o: sequence/%.cpp sequence/*.h common/*.h
- ${CXX} -c ${CXXFLAGS} $< -o $@
+ ${CXX} ${CPPFLAGS} -c ${CXXFLAGS} $< -o $@
#flye-assemble module
assemble_obj := ${patsubst %.cpp,%.o,${wildcard assemble/*.cpp}}
assemble/%.o: assemble/%.cpp assemble/*.h sequence/*.h common/*.h
- ${CXX} -c ${CXXFLAGS} $< -o $@
+ ${CXX} ${CPPFLAGS} -c ${CXXFLAGS} $< -o $@
#flye-repeat module
repeat_obj := ${patsubst %.cpp,%.o,${wildcard repeat_graph/*.cpp}}
repeat_graph/%.o: repeat_graph/%.cpp repeat_graph/*.h sequence/*.h common/*.h
- ${CXX} -c ${CXXFLAGS} $< -o $@
+ ${CXX} ${CPPFLAGS} -c ${CXXFLAGS} $< -o $@
#flye-contigger module
contigger_obj := ${patsubst %.cpp,%.o,${wildcard contigger/*.cpp}}
contigger/%.o: contigger/%.cpp repeat_graph/*.h sequence/*.h common/*.h
- ${CXX} -c ${CXXFLAGS} $< -o $@
+ ${CXX} ${CPPFLAGS} -c ${CXXFLAGS} $< -o $@
#flye-polish module
polish_obj := ${patsubst %.cpp,%.o,${wildcard polishing/*.cpp}}
polishing/%.o: polishing/%.cpp bin/polisher.cpp polishing/*.h common/*h
- ${CXX} -c ${CXXFLAGS} $< -o $@
+ ${CXX} ${CPPFLAGS} -c ${CXXFLAGS} $< -o $@
#main module
#main_obj := ${patsubst %.cpp,%.o,${wildcard main/*.cpp}}
@@ -60,7 +60,7 @@
#main/%.o: main/%.cpp assemble/*.h sequence/*.h common/*.h repeat_graph/*.h contigger/*.h polishing/*.h
main.o: main.cpp
- ${CXX} -c ${CXXFLAGS} $< -o $@
+ ${CXX} ${CPPFLAGS} -c ${CXXFLAGS} $< -o $@
clean:
|
