[gentoo-commits] gentoo-x86 commit in dev-db/redis/files: redis-2.4.17-shared.patch

[Dirkjan Ochtman (djc)]

djc         12/12/26 11:01:42

  Added:                redis-2.4.17-shared.patch
  Log:
  Fix redis compilation against jemalloc-3.2.0 (bug 444796).
  
  (Portage version: 2.1.11.27/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB)

Revision  Changes    Path
1.1                  dev-db/redis/files/redis-2.4.17-shared.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.4.17-shared.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.4.17-shared.patch?rev=1.1&content-type=text/plain

Index: redis-2.4.17-shared.patch
===================================================================
See https://github.com/antirez/redis/pull/137

--- src/Makefile	2011-10-17 10:46:00.000000000 +0200
+++ src/Makefile.2	2011-10-17 13:47:53.000000000 +0200
@@ -49,7 +49,16 @@
 ifeq ($(USE_JEMALLOC),yes)
   ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
   ALLOC_LINK=$(ALLOC_DEP) -ldl
-  ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
+  ALLOC_FLAGS=-DUSE_JEMALLOC
+   ifdef JEMALLOC_SHARED
+       ALLOC_DEP=
+       ALLOC_LINK=-ljemalloc
+       ALLOC_FLAGS=-DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include
+   else
+       ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
+       ALLOC_LINK=$(ALLOC_DEP) -ldl
+       ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
+   endif
 endif

 CCOPT= $(CFLAGS) $(ARCH) $(PROF)