diff options
| author | Tomas Mozes <hydrapolic@gmail.com> | 2018-08-23 02:09:41 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-08-23 02:22:22 +0200 |
| commit | 772fa4eaf2816bdeef6c2affe66814075b11bbe4 (patch) | |
| tree | 73e43fca6c8846e6190ea35a1d118b0f9946676d /dev-db/redis/files/redis-5.0-shared.patch | |
| parent | fae2f8bbf4986d941600dbf5bb1f7909559c81a1 (diff) | |
| download | gentoo-772fa4eaf2816bdeef6c2affe66814075b11bbe4.tar.gz gentoo-772fa4eaf2816bdeef6c2affe66814075b11bbe4.tar.bz2 gentoo-772fa4eaf2816bdeef6c2affe66814075b11bbe4.zip | |
dev-db/redis: bump to 5.0-rc4
Closes: https://github.com/gentoo/gentoo/pull/9472
Package-Manager: Portage-2.3.44, Repoman-2.3.10
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'dev-db/redis/files/redis-5.0-shared.patch')
| -rw-r--r-- | dev-db/redis/files/redis-5.0-shared.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/dev-db/redis/files/redis-5.0-shared.patch b/dev-db/redis/files/redis-5.0-shared.patch new file mode 100644 index 000000000000..32245079ab49 --- /dev/null +++ b/dev-db/redis/files/redis-5.0-shared.patch @@ -0,0 +1,32 @@ +diff --git a/src/Makefile b/src/Makefile +index f5525bd..6f12a20 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 (,$(filter aarch64 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_LIBS) ++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE ++ FINAL_LIBS+= -ljemalloc -ldl + endif + + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) |