summaryrefslogtreecommitdiff
path: root/databases/redis/files/patch-src::Makefile
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2012-05-28 07:23:16 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2012-05-28 07:23:16 +0000
commit0d32f8a129bd968942fdd72a7141f51996948b0c (patch)
tree259fdb8b97627997174040b6f9e93f11e68d9132 /databases/redis/files/patch-src::Makefile
parent- Unbreak build on powerpc (diff)
Update from 2.4.13 to 2.4.14.
<ChangeLog> UPGRADE URGENCY: high, many non trivial bugs fixed in this release. * [BUGFIX] Fixed issue #518 (Redis 99% CPU when master down). * [BUGFIX] Fixed issue #516 (ZINTERSTORE mixing sets and zsets). * [BUGFIX] Fixed a bug in install_server.sh when using chkconfig * [BUGFIX] Fixes to --test-memory implementation. * [BUGFIX] Allow PREFIX to be overridden in Makefile. * [BUGFIX] The test is now more reliable on slow computers. * redis-cli --pipe mode, see http://redis.io/topics/mass-insert * Much better expired keys collection algorithm that makes the server much more responsive when a lot of keys are expiring at the same time. </ChangeLog>
Notes
Notes: svn path=/head/; revision=297573
Diffstat (limited to 'databases/redis/files/patch-src::Makefile')
-rw-r--r--databases/redis/files/patch-src::Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile
index 65498ca25b83..fe18bb78aaba 100644
--- a/databases/redis/files/patch-src::Makefile
+++ b/databases/redis/files/patch-src::Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig 2011-11-28 14:22:08.000000000 +0400
-+++ src/Makefile 2011-11-30 16:33:17.000000000 +0400
+--- 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
@@ -17,8 +17,8 @@
-CCOPT= $(CFLAGS) $(ARCH) $(PROF)
+CCOPT= $(CFLAGS) $(PROF)
--PREFIX= /usr/local
+-PREFIX?=/usr/local
+PREFIX:= ${PREFIX}
INSTALL_BIN= $(PREFIX)/bin
- INSTALL= cp -p
+ INSTALL= cp -pf