archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-17 23:34:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

community/redis to 5.0.0-1

Browse source
This commit is contained in:
Kevin Mihelich 2018-10-21 21:15:16 +00:00
parent c0112102a7
commit ef1a65a7e1
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
community/redis/PKGBUILD
View file

@ -9,7 +9,7 @@
# - explicitly link v5/v6 with libatomic
pkgname=redis
pkgver=4.0.11
pkgver=5.0.0
pkgrel=1
pkgdesc='Advanced key-value store'
arch=('x86_64')
@ -24,19 +24,19 @@ source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
redis.tmpfiles
redis.logrotate
redis.conf-sane-defaults.patch
redis-2.8.11-use-system-jemalloc.patch)
sha512sums=('f0054af9ca2143731a397b2b21285387707b7f40d9326ba15225feb1a2ff470fab5194308342f63bbe1081f84c7e9ef19543c5a8e3eae49e17bfc515c64201f0'
redis-5.0-use-system-jemalloc.patch)
sha512sums=('818277cf8c14eb5f0b864e936f657c8021a3614a76dda8975d82b20ab4e3983731363b7b527fb504fd41292304de079f78702503fca867ac6f45a97a391eec07'
'86018ddd6625f918295e10f9478da361f73a6dbd6c6b8e4b974201669bcccbd4dba443bb0844be68f6ab8d5a1762b32af04c5e12df53b1f0ea812b790d9f4e37'
'2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
'68f7bc12e3b95cb199b71255c6aa5bfaa431fbabbc7d2308e54347c0d35e6d8091c4a79a5a6b56494ab3a294f9389e3ec63902931920862f60b1ffe77222eeeb'
'df11492df0458b224f75fff31475d39b85116cba6deb06d80d0fd8c467d221db51a2a8f5fc5d2e3e8239c0718e1cf5dc12e99cac9019cb99d3f11835ad00aa5d'
'fe9748e0ab326e429f4183016b5aeb772199cd4688371c320811c25f8de2fcb7bc34955b359612c1a287e83b4afaba3b7fd6a6567fad66c04e8482cc802f3b50'
'ab2c1c6b650e47312f55b433139c00d1781e4a8f8d8ec3310fac1aff7e1b45e9c1cb843eff205ef8e2a9f7251944ee37347a8a486ecb017f5da6b5e3a23dc75d')
'55b4085900c54fa7e7bf1c2bad7fba8cdbaf496a3f83b6d32fccb8aed5048cdde1690fea0485162dbb637e7fafb00a6b995908fa6db55e77854eb9f575b54d40')
prepare() {
cd $pkgname-$pkgver
patch -p1 -i ../redis.conf-sane-defaults.patch
patch -p1 -i ../redis-2.8.11-use-system-jemalloc.patch
patch -p1 -i ../redis-5.0-use-system-jemalloc.patch
if [[ $CARCH == arm || $CARCH == armv6h ]]; then
sed -ri 's/^(FINAL_LIBS=.*)/\1 -latomic/' src/Makefile
fi

15
community/redis/redis-2.8.11-use-system-jemalloc.patch
View file

@ -1,15 +0,0 @@
Index: redis-2.8.11/src/Makefile
===================================================================
--- redis-2.8.11.orig/src/Makefile
+++ redis-2.8.11/src/Makefile
@@ -84,8 +84,8 @@ endif
ifeq ($(MALLOC),jemalloc)
DEPENDENCY_TARGETS+= jemalloc
- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
+ FINAL_LIBS+= -ljemalloc
endif
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

15
community/redis/redis-5.0-use-system-jemalloc.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/src/Makefile b/src/Makefile
index 912cbc19..6840ce08 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,8 +125,8 @@ 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 -I/usr/include/jemalloc
+ FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
endif
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)