Debian Codegraph @

debian/patches/hardening.patch

raw
1 Description: hardening by passing LDFLAGS
2 Author: Pierre Gruet <[email protected]>
3 Forwarded: not-needed
4 Last-Update: 2022-07-04
5
6 --- a/src/main/c/Makefile
7 +++ b/src/main/c/Makefile
8 @@ -3,7 +3,7 @@
9 endif
10
11 JNI_INCLUDE_DIRS=$(addprefix -I,$(shell find $(JAVA_HOME)/include -type d))
12 -CFLAGS=-ggdb -O2 -Wall -fPIC $(JNI_INCLUDE_DIRS)
13 +CFLAGS+=-ggdb -O2 -Wall -fPIC $(JNI_INCLUDE_DIRS)
14 CC=gcc
15
16 #OS-dependent extension lookup
17 @@ -14,13 +14,13 @@
18 all: libbwa.$(LIB_EXT)
19
20 libbwa.$(LIB_EXT): $(JNI_BASE_NAME).o jnibwa.o bwaComponent/libbwa.a
21 - $(CC) -ggdb -dynamiclib -shared -o $@ $^ -lm -lz -lpthread
22 + $(CC) $(LDFLAGS) -ggdb -dynamiclib -shared -o $@ $^ -lm -lz -lpthread
23
24 bwaComponent:
25 sed -i.bak -e's/\(LOBJS=.*\)/\1 bwtindex.o rle.o rope.o bwt.o is.o/g' bwaComponent/Makefile
26
27 bwaComponent/libbwa.a: bwaComponent
28 - $(MAKE) CFLAGS="$(CFLAGS)" -C bwaComponent libbwa.a
29 + $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" -C bwaComponent libbwa.a
30
31 $(JNI_BASE_NAME).o: $(JNI_BASE_NAME).c jnibwa.h bwaComponent
32
33 --- a/bwa-apache2/Makefile
34 +++ b/bwa-apache2/Makefile
35 @@ -1,6 +1,6 @@
36 CC= gcc
37 #CC= clang --analyze
38 -CFLAGS= -g -Wall -Wno-unused-function -O2
39 +CFLAGS+= -g -Wall -Wno-unused-function -O2
40 WRAP_MALLOC=-DUSE_MALLOC_WRAPPERS
41 AR= ar
42 DFLAGS= -DHAVE_PTHREAD $(WRAP_MALLOC)
43 @@ -27,7 +27,7 @@
44 .SUFFIXES:.c .o .cc
45
46 .c.o:
47 - $(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $(CPPFLAGS) $< -o $@
48 + $(CC) $(CPPFLAGS) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
49
50 all:$(PROG)
51