Unbundle jemalloc
Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>
This commit is contained in:
parent
12623859e3
commit
9b86509d24
14
redis-deps-unbundle-jemalloc.patch
Normal file
14
redis-deps-unbundle-jemalloc.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- a/src/Makefile 2013-04-30 15:15:56.000000000 +0200
|
||||||
|
+++ b/src/Makefile 2013-06-07 09:13:06.913999530 +0200
|
||||||
|
@@ -71,9 +71,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 -ldl
|
||||||
|
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -I/usr/include/jemalloc
|
||||||
|
+ FINAL_LIBS+= -ljemalloc -ldl
|
||||||
|
endif
|
||||||
|
|
||||||
|
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
|
10
redis.spec
10
redis.spec
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
Name: redis
|
Name: redis
|
||||||
Version: 2.6.13
|
Version: 2.6.13
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A persistent key-value database
|
Summary: A persistent key-value database
|
||||||
|
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
@ -23,6 +23,7 @@ Source3: %{name}.service
|
|||||||
# Update configuration for Fedora
|
# Update configuration for Fedora
|
||||||
Patch0: %{name}-2.6.13-redis.conf.patch
|
Patch0: %{name}-2.6.13-redis.conf.patch
|
||||||
Patch1: %{name}-deps-PIC.patch
|
Patch1: %{name}-deps-PIC.patch
|
||||||
|
Patch2: %{name}-deps-unbundle-jemalloc.patch
|
||||||
|
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
%if !0%{?el5}
|
%if !0%{?el5}
|
||||||
@ -31,6 +32,7 @@ BuildRequires: tcl >= 8.5
|
|||||||
BuildRequires: google-perftools-devel
|
BuildRequires: google-perftools-devel
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: jemalloc-devel
|
||||||
|
|
||||||
Requires: logrotate
|
Requires: logrotate
|
||||||
Requires(post): chkconfig
|
Requires(post): chkconfig
|
||||||
@ -51,8 +53,11 @@ different kind of sorting abilities.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
rm -rvf deps/jemalloc
|
||||||
|
|
||||||
export CFLAGS="$RPM_OPT_FLAGS"
|
export CFLAGS="$RPM_OPT_FLAGS"
|
||||||
make %{?_smp_mflags} \
|
make %{?_smp_mflags} \
|
||||||
DEBUG="" \
|
DEBUG="" \
|
||||||
@ -121,6 +126,9 @@ fi
|
|||||||
%{_unitdir}/%{name}.service
|
%{_unitdir}/%{name}.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 07 2013 Fabian Deutsch <fabiand@fedoraproject.org> - 2.6.13-2
|
||||||
|
- Unbundle jemalloc
|
||||||
|
|
||||||
* Fri Jun 07 2013 Fabian Deutsch <fabiand@fedoraproject.org> - 2.6.13-1
|
* Fri Jun 07 2013 Fabian Deutsch <fabiand@fedoraproject.org> - 2.6.13-1
|
||||||
- Add compile PIE flag (rhbz#955459)
|
- Add compile PIE flag (rhbz#955459)
|
||||||
- Update to redis 2.6.13 (rhbz#820919)
|
- Update to redis 2.6.13 (rhbz#820919)
|
||||||
|
Loading…
Reference in New Issue
Block a user