diff options
| -rw-r--r-- | testing/redis/APKBUILD | 10 | ||||
| -rw-r--r-- | testing/redis/redis-unbundle-jemalloc.patch | 14 |
2 files changed, 3 insertions, 21 deletions
diff --git a/testing/redis/APKBUILD b/testing/redis/APKBUILD index 3d8d07484c..3cf4d66675 100644 --- a/testing/redis/APKBUILD +++ b/testing/redis/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=redis pkgver=2.8.9 -pkgrel=0 +pkgrel=1 pkgdesc="Advanced key-value store" url="http://redis.io/" arch="all" license="BSD" depends="" depends_dev="" -makedepends="jemalloc-dev" +makedepends="" install="redis.pre-install" subpackages="" pkgusers="redis" @@ -18,7 +18,6 @@ source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz redis.initd redis.logrotate redis.confd - redis-unbundle-jemalloc.patch redis-no-backtrace.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -40,9 +39,9 @@ prepare() { build() { cd "$_builddir" - export CFLAGS="$CFLAGS -std=c99" make PREFIX=/usr \ INSTALL_BIN="$pkgdir"/usr/bin \ + MALLOC=libc \ all || return 1 } @@ -76,17 +75,14 @@ md5sums="3c106b0f1128dc930684e2da88b2a03d redis-2.8.9.tar.gz 6910862d7f07d5655c3d827a7fdddd6e redis.initd f49b80f4418f456dbf865a32443d4d1d redis.logrotate bf204d560e41b854297c60aff8d862d5 redis.confd -e1099082cc40651e7cc19557f2fd2ee8 redis-unbundle-jemalloc.patch b05226a52976efe40a23117d0b1fd9fa redis-no-backtrace.patch" sha256sums="7834c37f2ff186c46aef8e4a066dfbf1d6772a285aa31c19c58162f264f1007f redis-2.8.9.tar.gz 573f75738c6e9526550334552a160b5e1fdb13fad0dbd859aaafdb2fa0f49310 redis.initd 197d9b212eec3b8cd33878ba224f9a79b6f98a43c0663caf7e084c7969beb3f9 redis.logrotate 97d50b2bee2df995317b505d459c31fe4abe74e670028f0335febdd6e4e31486 redis.confd -a98a5041a491877ed6010d86dff38332422f44d08cf47cb52b40fd57a6ed666b redis-unbundle-jemalloc.patch 595306f5ecd12530ef80914aef48020e2683cd6bb774aa167c3c3146c1b66907 redis-no-backtrace.patch" sha512sums="f202c44e16d257e33f7fabaa3b46218bf45848158a4b8c7cc2fab119fdf42bb4e19764a2f5f82fc8c76a3e353754b6b25f2cacf20a253d28244acbf87fd6dd7a redis-2.8.9.tar.gz 35f10b9cfcc19ebcffb418d031bdc5bcf613d5e12d601c04ad1475b0e805950cb3a2304ba6137432b0a1d9bbc788aa2d8246d036f9f96f3b9c1f7a76ffaad845 redis.initd 706cfedb7fb320649c7ad02845d7477b85ce1e5d9dced39b938c6f754e6e9eb666e22f6eddc4cbffa3f63a1f6fb6f3221244e5bcd8fa92706c256aa1fe50ff41 redis.logrotate d87aad6185300c99cc9b6a478c83bf62c450fb2c225592d74cc43a3adb93e19d8d2a42cc279907b385aa73a7b9c77b66828dbfb001009edc16a604abb2087e99 redis.confd -4d2cbc018c19ce9939571a6b81f7b7482dc5cb0b788e4a3aa59777259983dd2b4c2a9a3d06bbdb43a13cec897578fcd83eb6635baba7f6c888dd515821a4837a redis-unbundle-jemalloc.patch c2ff78d0c161ef63661e09d860887d35c74049a2ae3bd00ced755fb848dfe2ae60b1f0a2b435f5c028638db5502de1475f8355bb097d8180a4d2c76def36a1cc redis-no-backtrace.patch" diff --git a/testing/redis/redis-unbundle-jemalloc.patch b/testing/redis/redis-unbundle-jemalloc.patch deleted file mode 100644 index c2222cd0fa..0000000000 --- a/testing/redis/redis-unbundle-jemalloc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -83,9 +83,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 -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) |