aboutsummaryrefslogtreecommitdiffstats
path: root/databases/redis/files/patch-src::Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'databases/redis/files/patch-src::Makefile')
-rw-r--r--databases/redis/files/patch-src::Makefile31
1 files changed, 14 insertions, 17 deletions
diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile
index 1d51eecd7743..9641f2e4115f 100644
--- a/databases/redis/files/patch-src::Makefile
+++ b/databases/redis/files/patch-src::Makefile
@@ -1,24 +1,21 @@
---- src/Makefile.orig 2012-05-28 11:14:39.000000000 +0400
-+++ src/Makefile 2012-05-28 11:15:45.000000000 +0400
-@@ -28,6 +28,9 @@
- CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
- CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
- DEBUG?=-g -ggdb
+--- src/Makefile.orig 2012-08-01 14:06:03.000000000 +0400
++++ src/Makefile 2012-08-02 22:24:01.000000000 +0400
+@@ -50,6 +50,9 @@
+ FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb
+ FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread
+ DEBUG= -g -ggdb
+else ifeq ($(uname_S),FreeBSD)
-+ CFLAGS?= $(CFLAGS)
-+ CCLINK?= $(LDFLAGS)
++ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++ FINAL_LDFLAGS= $(LDFLAGS)
else
- CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
- CCLINK?=-lm -pthread
-@@ -52,9 +55,9 @@
- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
- endif
-
--CCOPT= $(CFLAGS) $(ARCH) $(PROF)
-+CCOPT= $(CFLAGS) $(PROF)
+ FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+ FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
+@@ -79,7 +82,7 @@
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+ REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
-PREFIX?=/usr/local
-+PREFIX:= ${PREFIX}
++PREFIX:=${PREFIX}
INSTALL_BIN= $(PREFIX)/bin
INSTALL= cp -pf