From 88764f95a84c70ad60cfa5cf0b7f790addc8b659 Mon Sep 17 00:00:00 2001 From: Fabian Deutsch Date: Wed, 19 Jun 2013 13:01:22 +0200 Subject: [PATCH] Modify jemalloc patch for s390 compatibility Signed-off-by: Fabian Deutsch --- redis-deps-unbundle-jemalloc.patch | 4 ++-- redis.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/redis-deps-unbundle-jemalloc.patch b/redis-deps-unbundle-jemalloc.patch index 7aa574d..c68c1f6 100644 --- a/redis-deps-unbundle-jemalloc.patch +++ b/redis-deps-unbundle-jemalloc.patch @@ -1,5 +1,5 @@ --- a/src/Makefile 2013-04-30 15:15:56.000000000 +0200 -+++ b/src/Makefile 2013-06-07 09:13:06.913999530 +0200 ++++ b/src/Makefile 2013-06-19 12:58:12.345612310 +0200 @@ -71,9 +71,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) endif @@ -7,7 +7,7 @@ - DEPENDENCY_TARGETS+= jemalloc - FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include - FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -I/usr/include/jemalloc ++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc + FINAL_LIBS+= -ljemalloc -ldl endif diff --git a/redis.spec b/redis.spec index 53a2646..4cce6d9 100644 --- a/redis.spec +++ b/redis.spec @@ -10,7 +10,7 @@ Name: redis Version: 2.6.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A persistent key-value database Group: Applications/Databases @@ -126,6 +126,9 @@ fi %{_unitdir}/%{name}.service %changelog +* Wed Jun 19 2013 Fabian Deutsch - 2.6.13-3 +- Modify jemalloc patch for s390 compatibility (Thanks sharkcz) + * Fri Jun 07 2013 Fabian Deutsch - 2.6.13-2 - Unbundle jemalloc