From 449868b8a1d4accba1a51a04260b8d0c4eb6fe91 Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Wed, 23 Nov 2011 11:56:53 +0000
Subject: Add quick fix for fresh redis. Also drop a note for UPDATING.

Feature safe:	yes
Pointy hat to:	osa
---
 databases/redis/files/patch-src::Makefile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'databases/redis/files/patch-src::Makefile')

diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile
index 1a3bdd9047d9..2bc136769d79 100644
--- a/databases/redis/files/patch-src::Makefile
+++ b/databases/redis/files/patch-src::Makefile
@@ -1,24 +1,24 @@
---- src/Makefile.orig	2011-09-14 10:32:32.000000000 +0400
-+++ src/Makefile	2011-09-14 10:34:08.000000000 +0400
-@@ -22,6 +22,9 @@
-   CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
-   CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
-   DEBUG?= -g -ggdb 
+--- src/Makefile.orig	2011-11-21 21:47:39.000000000 +0400
++++ src/Makefile	2011-11-23 06:29:54.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
 +else ifeq ($(uname_S),FreeBSD)
 +  CFLAGS?= $(CFLAGS)
 +  CCLINK?= -pthread -lm
  else
-   CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
-   CCLINK?= -lm -pthread
-@@ -32,9 +35,9 @@
-   CCLINK+= -ltcmalloc
-   CFLAGS+= -DUSE_TCMALLOC
+   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)
  
 -PREFIX= /usr/local
-+PREFIX?= $(PREFIX)
++PREFIX:= ${PREFIX}
  INSTALL_BIN= $(PREFIX)/bin
  INSTALL= cp -p
  
-- 
cgit v1.2.3