diff options
| author | Eivind Uggedal <eivind@uggedal.com> | 2014-04-16 12:22:31 +0000 |
|---|---|---|
| committer | Eivind Uggedal <eivind@uggedal.com> | 2014-04-16 12:24:20 +0000 |
| commit | 0d4c88881f22054e885ae7682468c71d42cc7e53 (patch) | |
| tree | 45168236c514c6c076e07062f5884d50fe9a69c8 /testing | |
| parent | 92a946c12e07770f28f78c6ef49644a1e5694413 (diff) | |
| download | aports-0d4c88881f22054e885ae7682468c71d42cc7e53.tar.bz2 aports-0d4c88881f22054e885ae7682468c71d42cc7e53.tar.xz | |
testing/redis: upgrade to 2.6.17
And fix musl build by disabling backtrace support
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/redis/APKBUILD | 22 | ||||
| -rw-r--r-- | testing/redis/redis-no-backtrace.patch | 11 |
2 files changed, 23 insertions, 10 deletions
diff --git a/testing/redis/APKBUILD b/testing/redis/APKBUILD index 5c193b3ef..549200865 100644 --- a/testing/redis/APKBUILD +++ b/testing/redis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: V.Krishn <vkrishn4@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=redis -pkgver=2.6.16 +pkgver=2.6.17 pkgrel=0 pkgdesc="Advanced key-value store" url="http://redis.io/" @@ -18,7 +18,8 @@ source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz redis.initd redis.logrotate redis.confd - redis-unbundle-jemalloc.patch" + redis-unbundle-jemalloc.patch + redis-no-backtrace.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -42,7 +43,6 @@ build() { export CFLAGS="$CFLAGS -std=c99" make PREFIX=/usr \ INSTALL_BIN="$pkgdir"/usr/bin \ - FORCE_LIBC_MALLOC=yes \ all || return 1 } @@ -68,23 +68,25 @@ package() { make PREFIX=/usr \ INSTALL_BIN="$pkgdir/usr/bin" \ - FORCE_LIBC_MALLOC=yes \ install || return 1 } -md5sums="ca1b81bd56fe0c5e2c8ec443a95c908d redis-2.6.16.tar.gz +md5sums="918d74591e272e4419cba5beef67e995 redis-2.6.17.tar.gz 7fb0daf8dcfcda6fd6291dc0291ce579 redis.initd f49b80f4418f456dbf865a32443d4d1d redis.logrotate bf204d560e41b854297c60aff8d862d5 redis.confd -a8c70ad9cc2633f87ac44eb78a1f6de9 redis-unbundle-jemalloc.patch" -sha256sums="81490918dcf82d124b36e48b0a9911bfba3f13abba04d8c89820324eff7df03a redis-2.6.16.tar.gz +a8c70ad9cc2633f87ac44eb78a1f6de9 redis-unbundle-jemalloc.patch +c2c9ac9ad280d15364dfcc6ecbb36f03 redis-no-backtrace.patch" +sha256sums="5a65b54bb6deef2a8a4fabd7bd6962654a5d35787e68f732f471bbf117f4768e redis-2.6.17.tar.gz 527c5200ac9bb7862ce048f728ca6a8091dc8efdabe8f4e81145212738ae3472 redis.initd 197d9b212eec3b8cd33878ba224f9a79b6f98a43c0663caf7e084c7969beb3f9 redis.logrotate 97d50b2bee2df995317b505d459c31fe4abe74e670028f0335febdd6e4e31486 redis.confd -ebc7cd565a9b5476d0211e6bf86840aa2bd2b73f995608743affc3e1c1dad982 redis-unbundle-jemalloc.patch" -sha512sums="469a29e2a755543a3b2c3deb467a72ae62b81c54a60ed1baf6f9d5687ef4b87c22d9cec6a43cec43dd90d4b5561f5bbcd2448f6edf8a784041233b80d9403b0b redis-2.6.16.tar.gz +ebc7cd565a9b5476d0211e6bf86840aa2bd2b73f995608743affc3e1c1dad982 redis-unbundle-jemalloc.patch +02110c8453a8753a6c82b6f80d9724e27db8b847e6bb0605f69761056a9a64d7 redis-no-backtrace.patch" +sha512sums="bc0d487cdab3ce1bfe68a6efad9f4532552065fa45cd4c4429f3413397ec228d1ecf9afd8d2cc6d4aee115c7fb757fa1ef480f34c264b2290fd30ec831131f82 redis-2.6.17.tar.gz cc5645e864aea72c247baf3fe344378e906392bec03b571280229fcc88698298a7574a7980ea8eead8626fa6b83ff3fac61abd8967f3dc35fb833c9a380d0bd1 redis.initd 706cfedb7fb320649c7ad02845d7477b85ce1e5d9dced39b938c6f754e6e9eb666e22f6eddc4cbffa3f63a1f6fb6f3221244e5bcd8fa92706c256aa1fe50ff41 redis.logrotate d87aad6185300c99cc9b6a478c83bf62c450fb2c225592d74cc43a3adb93e19d8d2a42cc279907b385aa73a7b9c77b66828dbfb001009edc16a604abb2087e99 redis.confd -743810a1d6224b8ebd5443f3db4bd4df863ac3c969862bc347b42489edce90a2699e5dca85eedc53db471d578e3a22dc806ee14cba1f5d261561a7c77a25388e redis-unbundle-jemalloc.patch" +743810a1d6224b8ebd5443f3db4bd4df863ac3c969862bc347b42489edce90a2699e5dca85eedc53db471d578e3a22dc806ee14cba1f5d261561a7c77a25388e redis-unbundle-jemalloc.patch +a45cd258442889e9abc958dcb664e6099bebfad27cefcfcf89887fa5c67c50ad21b4ef6d714f5fa48c29ab7cea41687999dc2798d95230806870ce45c39a5b2e redis-no-backtrace.patch" diff --git a/testing/redis/redis-no-backtrace.patch b/testing/redis/redis-no-backtrace.patch new file mode 100644 index 000000000..5c0332b37 --- /dev/null +++ b/testing/redis/redis-no-backtrace.patch @@ -0,0 +1,11 @@ +--- src/redis-2.6.16/src/config.h.orig ++++ src/redis-2.6.16/src/config.h +@@ -54,7 +54,7 @@ + #endif + + /* Test for backtrace() */ +-#if defined(__APPLE__) || defined(__linux__) ++#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) + #define HAVE_BACKTRACE 1 + #endif + |