File: hardening.patch

package info (click to toggle)
libssw 1.1-13
  • links: PTS, VCS
  • area: main
  • in suites: bookworm, bullseye
  • size: 28,616 kB
  • sloc: ansic: 14,533; cpp: 493; python: 382; java: 136; makefile: 90; sh: 29
file content (56 lines) | stat: -rw-r--r-- 1,649 bytes parent folder | download | duplicates (2)
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
Description: add hardening
Author: Sascha Steinbiss <sascha@steinbiss.name>
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,8 @@
-CC = gcc
-CXX = g++
-CFLAGS := -Wall -pipe -O2
-CXXFLAGS := $(CFLAGS)
+CC ?= gcc
+CXX ?= g++
+AR ?= ar
+#CFLAGS := -Wall -pipe -O2
+#CXXFLAGS := $(CFLAGS)
 LOBJS = ssw.o
 LCPPOBJS = ssw_cpp.o
 PROG = ssw_test
@@ -24,7 +25,7 @@
 java: $(JAVA_JAR) $(JAVA_LIB)
 
 $(LIB): ssw.c ssw.h ssw_cpp.h ssw_cpp.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -shared -rdynamic -Wl,-soname,$(LIB) -o $@ $^
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -shared -rdynamic -Wl,-soname,$(LIB) -o $@ $^ $(LDFLAGS)
 
 $(STATICLIB): $(LOBJS) $(LCPPOBJS)
 	ar rcs $@ $^
@@ -34,13 +35,13 @@
 $(EXAMPLE): example.c
 
 $(PROG) $(EXAMPLE): $(LOBJS)
-	$(CC) -o $@ $(filter-out %.h,$^) $(CFLAGS) -lm -lz
+	$(CC) -o $@ $(filter-out %.h,$^) $(CPPFLAGS) $(CFLAGS) -lm -lz $(LDFLAGS)
 
 $(EXAMPLE_CPP): example.cpp $(LOBJS) $(LCPPOBJS)
-	$(CXX) -o $@ $^ $(CXXFLAGS) -lm -lz
+	$(CXX) -o $@ $^ $(CXXFLAGS) $(CPPFLAGS) -lm -lz $(LDFLAGS)
 
 $(JAVA_LIB): sswjni.c ssw.c ssw.h
-	$(CC) $(CFLAGS) $(JAVA_INLCUDES) -fPIC -shared -rdynamic -o $@ $< ssw.c 
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(JAVA_INLCUDES) -fPIC -shared -rdynamic -o $@ $< ssw.c $(LDFLAGS)
 
 $(JAVA_JAR): $(JAVA_OBJ)
 	jar cvf $@ $^
@@ -49,10 +50,10 @@
 	javac $<
 	
 ssw.o: ssw.c ssw.h
-	$(CC) -c -o $@ $< $(CFLAGS)
+	$(CC) -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
 ssw_cpp.o: ssw_cpp.cpp ssw_cpp.h ssw.h
-	$(CXX) -c -o $@ $< $(CXXFLAGS)
+	$(CXX) -c -o $@ $< $(CPPFLAGS) $(CXXFLAGS)
 
 clean:
 	-rm -f $(LOBJS) $(LCPPOBJS) $(PROG) $(LIB) $(EXAMPLE) $(EXAMPLE_CPP) $(JAVA_LIB) *.jar $(JAVA_OBJ) *~ $(STATICLIB)