diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-04-15 07:02:19 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-04-15 07:02:19 +0000 |
| commit | c85cd9d8d6550540bea93baeba24f5f3d8bfeb04 (patch) | |
| tree | 329e60a5a2afdf365f360b7b234f207b976c32d1 /main/asterisk | |
| parent | 2420eee64a2eff42a4178c26caceefedda58bdd2 (diff) | |
| download | aports-c85cd9d8d6550540bea93baeba24f5f3d8bfeb04.tar.bz2 aports-c85cd9d8d6550540bea93baeba24f5f3d8bfeb04.tar.xz | |
main/asterisk: fix arm build
Diffstat (limited to 'main/asterisk')
| -rw-r--r-- | main/asterisk/APKBUILD | 6 | ||||
| -rw-r--r-- | main/asterisk/musl-libcap.patch | 21 |
2 files changed, 18 insertions, 9 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 22ea3787c7..187a3832dd 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -253,7 +253,7 @@ md5sums="95b4850668b8880e6c4bfefae4fb427c asterisk-13.3.0.tar.gz 608f55942e82194a742634ddfd03cd2e asterisk-13.3.1-patch.gz 756c24ef3b2bb638246308093ea15910 asterisk-13.3.2-patch.gz 126dd4fba66f4cf9aa94dfd7034e0ec4 asterisk-addon-mp3-r201.patch.gz -9a2444cd3d06f394e06a1e90ef508420 musl-libcap.patch +7b699961171a93d7788420f518c5931e musl-libcap.patch 1147c81ac5e49c36a5d264019480bec0 musl-includes.patch 9b3e6cb75464a6ef4c40d191bdfdf7ea musl-glob-compat.patch 10b84632764a6f05ec9973c31f5e82fb musl-outofmem-handling.patch @@ -268,7 +268,7 @@ sha256sums="88b1eaab1b2d45722f89f51e1fa47883a8fab283bc1dc2ffd7d7c6a0e4411d57 as 5e9fbd1b1e3ee0790fee65bc01e790cdfed8b01683eff99110d0a262d97a0740 asterisk-13.3.1-patch.gz ee2353b1cb9b7c7fa17d8c5220ad2a7f6adbc8b3e013312ebb745ab5aea80267 asterisk-13.3.2-patch.gz d32a5a695cee1699011d0e9ad02eb43af612def06f92017627194099edf98e3f asterisk-addon-mp3-r201.patch.gz -1cd2405504ffddf0473d69849825bdf87a1029818bf4800707d82f2b0efd4899 musl-libcap.patch +f23aa2c03f9be1eb3c4c0ceac79ddcce7381aae46d6e6853ad20b1de5ac125d9 musl-libcap.patch 354596949399ac38f245e03a0833ca4cf6aa664e28ef92d79715c654465aa5fe musl-includes.patch c6a5c32646b767f09ebffccc49cac6a4ff9181498499e4453300775e75284b52 musl-glob-compat.patch 235b9c339793c02d1d80ac37d308cf14dc3e86fe8ccbe757e9855b186d9c164b musl-outofmem-handling.patch @@ -283,7 +283,7 @@ sha512sums="2751608b35e21f4ea8d9b053a8dcaaf532bd16d7a1105550c1d44ea121a700ee1499 7591c244e9971bbc76669e19b155e983461789fed8213e27b6f085b7b95c8a6d50a07aa28cc54672c4b6d46a939070bd18d929795f7a4279f0adc4947b15adfe asterisk-13.3.1-patch.gz 707495ec3862b8448e6bf09d188a368e8732ae0d3de246d00943d7391da825ba91a3692d69da68e6561efcffe631340146c27cce534e6260b0f5f4f7814e2b45 asterisk-13.3.2-patch.gz aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz -8826ab6b7d17f3b3292854b4c35f4b51dc456484e4325f743821b5d6099bfe59810f43c173d011c4cb018c2de789462403b6f378492e37293bc4bbff643c4448 musl-libcap.patch +31bdf1323155a9fbedf8c05183167903ff83bef4d408848368d3fab78e6c6265228ceece54375d68df6a99b9c1879431033d0a8cec875244c61ccc1f8e37fc5d musl-libcap.patch 7eb3c1f3207d8f7c58fbc3b30e7b9193e7498da09d53d7e907f3d9d79ffc86fa6f83b593dc4c1b0007d7e62565cb8618dc415d1a9ee61affa10e6a64b146967a musl-includes.patch edf65eba44e8f1f0e78671aba312bcff2090134cf94e89ebb4b6beef7b2d57b24381ae9511cbf9fffe6b555e695a3dbe2cedcd04f1d237df822fa742bd5092ac musl-glob-compat.patch 7cbbad2c16d89b0b4ea45257a44c25ea96ca6ecb1f5bf7707656dfa3957cae34d1dca404b3d62baca8b55cea6f9fa39819bef48a1f4dad0124da95d6c80a294e musl-outofmem-handling.patch diff --git a/main/asterisk/musl-libcap.patch b/main/asterisk/musl-libcap.patch index 3a45d5455f..a414e05fd3 100644 --- a/main/asterisk/musl-libcap.patch +++ b/main/asterisk/musl-libcap.patch @@ -1,7 +1,16 @@ -diff -ru asterisk-12.4.0.orig/configure.ac asterisk-12.4.0/configure.ac ---- asterisk-12.4.0.orig/configure.ac 2014-08-06 09:07:19.000000000 -0300 -+++ asterisk-12.4.0/configure.ac 2014-08-06 09:10:16.350632198 -0300 -@@ -1259,9 +1259,11 @@ +--- asterisk-13.3.2.orig/configure.ac ++++ asterisk-13.3.2/configure.ac +@@ -181,6 +181,9 @@ + linux-gnueabi* | linux-gnuspe) + OSARCH=linux-gnu + ;; ++ linux-musl*) ++ OSARCH=linux-musl ++ ;; + kfreebsd*-gnu) + OSARCH=kfreebsd-gnu + ;; +@@ -1328,9 +1331,11 @@ AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_check_format], [bfd.h], [-ldl -liberty -lz]) fi @@ -15,8 +24,8 @@ diff -ru asterisk-12.4.0.orig/configure.ac asterisk-12.4.0/configure.ac AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230]) AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220]) ---- asterisk-13.3.1/main/Makefile.orig 2015-04-07 05:29:42.561354397 +0000 -+++ asterisk-13.3.1/main/Makefile 2015-04-07 05:30:11.421884787 +0000 +--- asterisk-13.3.2.orig/main/Makefile ++++ asterisk-13.3.2/main/Makefile @@ -42,7 +42,7 @@ AST_LIBS+=$(CRYPT_LIB) AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS) |