File: fix-makefile.patch

package info (click to toggle)
statsprocessor 0.11-3
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 34,900 kB
  • ctags: 81
  • sloc: ansic: 783; makefile: 37; sh: 8
file content (53 lines) | stat: -rw-r--r-- 1,664 bytes parent folder | download
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
Description: fix Makefile
 This patch allows the addition of hardening flags and also removes the
 artificial distinction between 32bit and 64bit binaries.
Author: Sascha Steinbiss <satta@debian.org>
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,38 +2,32 @@
 ##  Makefile for sp
 ##
 
-CFLAGS = -W -Wall -std=c99 -O2 -s
+CFLAGS += -W -Wall -std=c99 -O2 -s
 #CFLAGS = -W -Wall -std=c99 -g
 
 #CC_LINUX32        = /opt/hashcat-toolchain/linux32/bin/i686-hashcat-linux-gnu-gcc
 #CC_LINUX64        = /opt/hashcat-toolchain/linux64/bin/x86_64-hashcat-linux-gnu-gcc
-CC_LINUX32        = gcc
-CC_LINUX64        = gcc
+CC_LINUX32        = $(CC)
+CC_LINUX64        = $(CC)
 CC_WINDOWS32      = /usr/bin/i686-w64-mingw32-gcc
 CC_WINDOWS64      = /usr/bin/x86_64-w64-mingw32-gcc
 CC_OSX32          = /usr/bin/i686-apple-darwin10-gcc
 CC_OSX64          = /usr/bin/i686-apple-darwin10-gcc
 
-CFLAGS_LINUX32    = $(CFLAGS) -m32 -DLINUX
-CFLAGS_LINUX64    = $(CFLAGS) -m64 -DLINUX
+CFLAGS_LINUX32    = $(CFLAGS) -DLINUX
+CFLAGS_LINUX64    = $(CFLAGS) -DLINUX
 CFLAGS_WINDOWS32  = $(CFLAGS) -m32 -DWINDOWS
 CFLAGS_WINDOWS64  = $(CFLAGS) -m64 -DWINDOWS
 CFLAGS_OSX32      = $(CFLAGS) -m32 -DOSX
 CFLAGS_OSX64      = $(CFLAGS) -m64 -DOSX
 
-all: sp64.bin
-
-sp32: sp32.bin sp32.exe sp32.app
-sp64: sp64.bin sp64.exe sp64.app
+all: sp64
 
 clean:
 	rm -f sp32.bin sp64.bin sp32.exe sp64.exe sp32.app sp64.app
 
-sp32.bin: sp.c
-	$(CC_LINUX32)   $(CFLAGS_LINUX32)   -o $@ $^
-
-sp64.bin: sp.c
-	$(CC_LINUX64)   $(CFLAGS_LINUX64)   -o $@ $^
+sp64: sp.c
+	$(CC_LINUX64) $(CPPFLAGS)  $(CFLAGS_LINUX64)   -o $@ $^ $(LDFLAGS)
 
 sp32.exe: sp.c
 	$(CC_WINDOWS32) $(CFLAGS_WINDOWS32) -o $@ $^