diff options
| author | Tomas Mozes <hydrapolic@gmail.com> | 2017-08-15 16:12:25 +0200 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2017-08-16 15:39:16 -0700 |
| commit | 8e47a75c9f108787156127127368da681c8241d6 (patch) | |
| tree | a146a47bf9b696e01b8eae78813861ef3ec805b2 /dev-db/redis/files/redis-4.0.1-shared.patch | |
| parent | 7a54c6df3437285b312d97a6c0c2cabe04dd271e (diff) | |
| download | gentoo-8e47a75c9f108787156127127368da681c8241d6.tar.gz gentoo-8e47a75c9f108787156127127368da681c8241d6.tar.bz2 gentoo-8e47a75c9f108787156127127368da681c8241d6.zip | |
dev-db/redis: bump to 4.0.1
Fixes: https://github.com/gentoo/gentoo/pull/5429
Package-Manager: Portage-2.3.7, Repoman-2.3.2
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'dev-db/redis/files/redis-4.0.1-shared.patch')
| -rw-r--r-- | dev-db/redis/files/redis-4.0.1-shared.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/dev-db/redis/files/redis-4.0.1-shared.patch b/dev-db/redis/files/redis-4.0.1-shared.patch new file mode 100644 index 000000000000..945d114ae2fb --- /dev/null +++ b/dev-db/redis/files/redis-4.0.1-shared.patch @@ -0,0 +1,32 @@ +diff --git a/src/Makefile b/src/Makefile +index 86e0b3fe..c7db0ee9 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,14 +29,7 @@ INSTALL_BIN=$(PREFIX)/bin + INSTALL=install + + # Default allocator defaults to Jemalloc if it's not an ARM +-MALLOC=libc +-ifneq ($(uname_M),armv6l) +-ifneq ($(uname_M),armv7l) +-ifeq ($(uname_S),Linux) +- MALLOC=jemalloc +-endif +-endif +-endif ++MALLOC?=jemalloc + + # To get ARM stack traces if Redis crashes we need a special C flag. + ifneq (,$(findstring armv,$(uname_M))) +@@ -120,9 +113,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 ++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE ++ FINAL_LIBS+= -ljemalloc -ldl + endif + + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) |