Gentoo Archives: gentoo-commits

From: "Luca Barbato (lu_zero)" <lu_zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/redis/files: redis-2.4.3-shared.patch
Date: Sat, 26 Nov 2011 10:37:57
Message-Id: 20111126103748.212CF2004C@flycatcher.gentoo.org
1 lu_zero 11/11/26 10:37:48
2
3 Added: redis-2.4.3-shared.patch
4 Log:
5 New version, thanks to Dirkjan Ochtman <djc@g.o> and Johan Bergström <bugs@××××××××××.nu> in bug #378085 for the patches and the updated ebuild.
6
7 (Portage version: 2.2.0_alpha76/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-db/redis/files/redis-2.4.3-shared.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.4.3-shared.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.4.3-shared.patch?rev=1.1&content-type=text/plain
14
15 Index: redis-2.4.3-shared.patch
16 ===================================================================
17 See https://github.com/antirez/redis/pull/137
18
19 --- src/Makefile 2011-10-17 10:46:00.000000000 +0200
20 +++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200
21 @@ -49,7 +49,16 @@
22 ifeq ($(USE_JEMALLOC),yes)
23 ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
24 ALLOC_LINK=$(ALLOC_DEP) -ldl
25 - ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
26 + ALLOC_FLAGS=-DUSE_JEMALLOC
27 + ifdef JEMALLOC_SHARED
28 + ALLOC_DEP=
29 + ALLOC_LINK=-ljemalloc
30 + ALLOC_FLAGS=-DUSE_JEMALLOC -I/usr/include
31 + else
32 + ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
33 + ALLOC_LINK=$(ALLOC_DEP) -ldl
34 + ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
35 + endif
36 endif
37
38 CCOPT= $(CFLAGS) $(ARCH) $(PROF)