Commit | Line | Data |
---|---|---|
0301524b OS |
1 | Description: this patch enabled hardened build |
2 | Last-update: 2016-11-07 | |
3 | Origin: vendor | |
4 | Author: gustavo panizzo <gfa@zumbi.com.ar> | |
5 | ||
6 | Index: tsocks-1.8beta5+ds1/Makefile.in | |
7 | =================================================================== | |
8 | --- tsocks-1.8beta5+ds1.orig/Makefile.in | |
9 | +++ tsocks-1.8beta5+ds1/Makefile.in | |
10 | @@ -28,6 +28,8 @@ | |
11 | INSTALL = @INSTALL@ | |
12 | INSTALL_DATA = @INSTALL_DATA@ | |
13 | CFLAGS = @CFLAGS@ | |
14 | +CPPFAGS = @CPPFLAGS@ | |
15 | +LDFLAGS = @LDFLAGS@ | |
16 | INCLUDES = -I. | |
17 | LIBS = @LIBS@ | |
18 | SPECIALLIBS = @SPECIALLIBS@ | |
19 | @@ -41,23 +43,23 @@ | |
20 | all: ${TARGETS} | |
21 | ||
22 | ${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o | |
23 | - ${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} | |
24 | + ${SHCC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} | |
25 | ||
26 | ${INSPECT}: ${INSPECT}.c ${COMMON}.o | |
27 | - ${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} | |
28 | + ${SHCC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} | |
29 | ||
30 | ${SAVE}: ${SAVE}.c | |
31 | - ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c | |
32 | + ${SHCC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c | |
33 | ||
34 | ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o | |
35 | - ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} | |
36 | + ${SHCC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${INCLUDES} -Wl,-soname,libtsocks.so.1 -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} | |
37 | ln -sf ${SHLIB} ${LIB_NAME}.so | |
38 | ||
39 | %.so: %.c | |
40 | - ${SHCC} ${CFLAGS} ${INCLUDES} -c ${CC_SWITCHES} $< -o $@ | |
41 | + ${SHCC} ${CFLAGS} ${CPPFLAGS} ${INCLUDES} -c ${CC_SWITCHES} $< -o $@ | |
42 | ||
43 | %.o: %.c | |
44 | - ${SHCC} ${CFLAGS} ${INCLUDES} -c ${CC_SWITCHES} $< -o $@ | |
45 | + ${SHCC} ${CFLAGS} ${CPPFLAGS} ${INCLUDES} -c ${CC_SWITCHES} $< -o $@ | |
46 | ||
47 | install: ${TARGETS} installscript installlib installman | |
48 |