diff options
Diffstat (limited to 'net/csocks/files/patch-Makefile')
| -rw-r--r-- | net/csocks/files/patch-Makefile | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/net/csocks/files/patch-Makefile b/net/csocks/files/patch-Makefile index eb2f6dd09008..be90e73fd786 100644 --- a/net/csocks/files/patch-Makefile +++ b/net/csocks/files/patch-Makefile @@ -1,15 +1,28 @@ ---- Makefile.orig 2014-04-11 23:48:26.646982600 +0200 -+++ Makefile 2014-04-11 23:49:46.629977600 +0200 -@@ -1,9 +1,9 @@ - # Compiler/Linker/dynamic linker +--- Makefile.orig 2008-02-20 13:32:02 UTC ++++ Makefile +@@ -1,14 +1,10 @@ +-# Compiler/Linker/dynamic linker -CC = gcc -LD = gcc -+CC ?= gcc -+LD = $(CC) - +- # flags to compile object files that can be used in a dynamic library --CFLAGS = -fPIC -Wall -g -c -O2 -fno-strict-aliasing -pipe -Wall -std=c99 -D'CSOCKS_CONF="/usr/local/etc/csocks.conf"' -+CFLAGS += -fPIC -c -std=c99 -D'CSOCKS_CONF="$(PREFIX)/etc/csocks.conf"' +-CFLAGS = -Wall -fPIC -g -c -O2 -std=c99 -fno-strict-aliasing -D'LINUX' -D'CSOCKS_PATH_LIBC="libc.so.6"' -D'CSOCKS_LIBCONNECT="libc.so.6"' -D'CSOCKS_CONF="/etc/csocks.conf"' ++CFLAGS += -fPIC -std=c99 -fno-strict-aliasing -D'LINUX' -D'CSOCKS_PATH_LIBC="libc.so.7"' -D'CSOCKS_LIBCONNECT="libc.so.7"' -D'CSOCKS_CONF="${PREFIX}/etc/csocks.conf"' + # on some platforms, use '-fpic' instead. # Flags to create a dynamic library. +-DYNLINKFLAGS = -Wall -fPIC -O2 -shared -rdynamic -std=c99 -nostdlib ++DYNLINKFLAGS = -Wall -fPIC -shared -rdynamic -std=c99 -nostdlib + # on some platforms, use '-G' instead. + + # files removal +@@ -31,7 +27,7 @@ all: $(LIB_FILE) + + # create our library + $(LIB_FILE): $(LIB_OBJS) +- $(LD) $(DYNLINKFLAGS) -Wl,-soname,$(LIB_FILE) -o $(LIB_FILE) $(LIB_OBJS) -lc -lgcc -ldl ++ $(CC) $(DYNLINKFLAGS) $(LDFLAGS) -Wl,-soname,$(LIB_FILE) -o $(LIB_FILE) $(LIB_OBJS) -lc -lgcc + + # compile C source files into object files. + %.o: %.c |