diff --git a/srcpkgs/redis/patches/use-system-jemalloc.patch b/srcpkgs/redis/patches/use-system-jemalloc.patch new file mode 100644 index 00000000000..68d3a79f6cc --- /dev/null +++ b/srcpkgs/redis/patches/use-system-jemalloc.patch @@ -0,0 +1,16 @@ +diff --git a/src/Makefile.orig b/src/Makefile +index 8b3e959890b5..f20408402611 100644 +--- src/Makefile.orig ++++ src/Makefile +@@ -89,9 +89,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) + endif + + ifeq ($(MALLOC),jemalloc) +- DEPENDENCY_TARGETS+= jemalloc +- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include +- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl ++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE ++ FINAL_LIBS+= -ljemalloc -ldl + endif + + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index 60b131b3b89..b438b1f8849 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -1,7 +1,8 @@ # Template file for 'redis' pkgname=redis version=2.8.17 -revision=1 +revision=2 +makedepends="jemalloc-devel" homepage="http://redis.io" distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" short_desc="advanced key-value store" @@ -11,7 +12,6 @@ checksum=53c7cc639571729fa57d7baa7f81aec1d5886f86bac9c66f6ad06dbdaee236a7 system_accounts="redis" redis_homedir="/var/lib/redis" conf_files="/etc/redis/redis.conf" -nocross=yes make_dirs=" /var/lib/redis 0700 redis redis /run/redis 0750 redis redis"