diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-12-03 08:16:58 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-12-03 08:16:58 +0000 |
| commit | d2009a88199d1a01802783aeeedbc2326440e110 (patch) | |
| tree | 96f6fa6ab62d5ea45ce43a738307b97111ac28a3 | |
| parent | 0f2d95f686781dada2364d59fb26e1accc273354 (diff) | |
| download | aports-d2009a88199d1a01802783aeeedbc2326440e110.tar.bz2 aports-d2009a88199d1a01802783aeeedbc2326440e110.tar.xz | |
main/varnish: fix arm build
arm has only limited support for __builtin_return_address() due
to calling convention. disable the backtrace() emulation on arm.
| -rw-r--r-- | main/varnish/APKBUILD | 21 | ||||
| -rw-r--r-- | main/varnish/fix-compat-execinfo.patch | 11 |
2 files changed, 24 insertions, 8 deletions
diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD index 96dd975859..296bd03eb1 100644 --- a/main/varnish/APKBUILD +++ b/main/varnish/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=varnish pkgver=4.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="High-performance HTTP accelerator" url="http://www.varnish-cache.org/" arch="all" @@ -16,11 +16,13 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-geoip" pkgusers="varnish" pkggroups="varnish" source="http://repo.varnish-cache.org/source/varnish-$pkgver.tar.gz + fix-compat-execinfo.patch + musl-mode_t.patch + varnishd.initd varnishd.confd varnishd.logrotate maxminddb.vcl - musl-mode_t.patch " _builddir="$srcdir"/varnish-$pkgver @@ -83,20 +85,23 @@ geoip() { } md5sums="bf86f3630605c273b1bbadbbe518237a varnish-4.0.2.tar.gz +2fec4f98c892e07d97d93a7bb8529fea fix-compat-execinfo.patch +54d12d231c505c95ae3ae09487b5dde4 musl-mode_t.patch 7e5df695886d0932312c23e9908893fa varnishd.initd 1ed5a6de82e6204400229fa79a54d9a7 varnishd.confd a6cb8a43c9465699cf956dc992998225 varnishd.logrotate -2cbaa46b9da9f78ecf4c906730f7c5e3 maxminddb.vcl -54d12d231c505c95ae3ae09487b5dde4 musl-mode_t.patch" +2cbaa46b9da9f78ecf4c906730f7c5e3 maxminddb.vcl" sha256sums="d9fb6a6eaf05bbb0c8eb5855556a4b092183b2c1a61281bfd73adf83a304555b varnish-4.0.2.tar.gz +66a281c03bcf0c01bc8215fe39a3b6a593751fb2034824b471596d517554e183 fix-compat-execinfo.patch +f96b6dab0e68e169cffceb63776e312d8585bc2a46dfcc5fa2b1ec5e953ad624 musl-mode_t.patch 8932b8095fc080911aeabeb9da3eb26cc96533cb6b9edbecb9ab0e8a6337f961 varnishd.initd c252697811103e9846069b4d4de750105d79960a289ea1f7fcf1e99f682fb5dc varnishd.confd 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e varnishd.logrotate -fd6c810a6099b1b0c2eb572aec239e3f51debc52a6c32fce715f265d7b1a1f85 maxminddb.vcl -f96b6dab0e68e169cffceb63776e312d8585bc2a46dfcc5fa2b1ec5e953ad624 musl-mode_t.patch" +fd6c810a6099b1b0c2eb572aec239e3f51debc52a6c32fce715f265d7b1a1f85 maxminddb.vcl" sha512sums="262bef5823f56c70fa9c7f24225b02b0218889c216143f63bb11db978ca7eddb174f605a5e48a4e774d88b20af5f5845bb2a6aef6fa3aaaf7cacd8c7c17cb82f varnish-4.0.2.tar.gz +e4c3b8fe85ccb3f37c69561b981f89c757acc5534379afec551b7eabc2fe8661e3566513f4bfea9192af8576fc587b34170008f5818038c17c412ac64b27cf51 fix-compat-execinfo.patch +8758bef9039a2cca23b7302668bd49f1ea07f54835512a8a9558bb9ed5de1c0fca53f2085ccd298fe0c6579fc81c3b583a85f4f6b25b6ad85f89bf3be04afb70 musl-mode_t.patch 0f4cf890254c0670b09d384b520e303b82b72234147b2d87a5199030032bbe7e6fa566e5a08af3a92e37f556a54252798268b64e8efb76b8b4141b25732529b3 varnishd.initd f2b4f88c1cea5d8576bf5c6ea82ee841c1fa9dd10daaef668c262669c2d3bc9d151f3c491f8678717047cf0d161c25b4104dd4d29bc8ddb44dd749b7f58c39e7 varnishd.confd 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c varnishd.logrotate -69f088819cff6d4441813be284f4117f232d08908515bd15d96bd5bb9d41ba7100657a52fd408d44c396d004366062ae22fbf08e2a983cd8023b554539ccf596 maxminddb.vcl -8758bef9039a2cca23b7302668bd49f1ea07f54835512a8a9558bb9ed5de1c0fca53f2085ccd298fe0c6579fc81c3b583a85f4f6b25b6ad85f89bf3be04afb70 musl-mode_t.patch" +69f088819cff6d4441813be284f4117f232d08908515bd15d96bd5bb9d41ba7100657a52fd408d44c396d004366062ae22fbf08e2a983cd8023b554539ccf596 maxminddb.vcl" diff --git a/main/varnish/fix-compat-execinfo.patch b/main/varnish/fix-compat-execinfo.patch new file mode 100644 index 0000000000..e806a32774 --- /dev/null +++ b/main/varnish/fix-compat-execinfo.patch @@ -0,0 +1,11 @@ +--- varnish-4.0.2.orig/lib/libvarnishcompat/execinfo.c ++++ varnish-4.0.2/lib/libvarnishcompat/execinfo.c +@@ -30,7 +30,7 @@ + + #include "compat/execinfo.h" + +-#if defined (__GNUC__) && __GNUC__ >= 4 /* XXX Correct version to check for ? */ ++#if !defined(__arm__) && defined (__GNUC__) && __GNUC__ >= 4 /* XXX Correct version to check for ? */ + + #include <sys/types.h> + #include <sys/uio.h> |