From dfd5c14f2302b597f781c4bb1d1eee34fdaacf9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 7 Apr 2014 11:33:33 +0300
Subject: [PATCH] main/musl: add one more arm fix, and bump pkgrel
---
...-1974bffa.patch => 0003-b9b2db2f-to-efe07b0f.patch} | 4 ++--
main/musl/APKBUILD | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
rename main/musl/{0003-b9b2db2f-to-1974bffa.patch => 0003-b9b2db2f-to-efe07b0f.patch} (98%)
diff --git a/main/musl/0003-b9b2db2f-to-1974bffa.patch b/main/musl/0003-b9b2db2f-to-efe07b0f.patch
similarity index 98%
rename from main/musl/0003-b9b2db2f-to-1974bffa.patch
rename to main/musl/0003-b9b2db2f-to-efe07b0f.patch
index b8089875be0e..5c4291378b56 100644
--- a/main/musl/0003-b9b2db2f-to-1974bffa.patch
+++ b/main/musl/0003-b9b2db2f-to-efe07b0f.patch
@@ -1,5 +1,5 @@
diff --git a/arch/arm/atomic.h b/arch/arm/atomic.h
-index 734d287..fe88225 100644
+index 734d287..50ad947 100644
--- a/arch/arm/atomic.h
+++ b/arch/arm/atomic.h
@@ -22,7 +22,28 @@ static inline int a_ctz_64(uint64_t x)
@@ -21,7 +21,7 @@ index 734d287..fe88225 100644
+ " beq 1b\n"
+ " mcr p15,0,r0,c7,c10,5\n"
+ : "=&r"(ret)
-+ : "r"(t), "r"(s), "m"(*p)
++ : "r"(t), "r"(s), "Q"(*p)
+ : "memory", "cc" );
+ return ret;
+}
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 2e5329a075f6..8cc3879ea025 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=musl
pkgver=1.0.0
-pkgrel=6
+pkgrel=7
pkgdesc="the musl c library (libc) implementation"
url="http://www.musl-libc.org/"
arch="all"
@@ -16,7 +16,7 @@ subpackages="$pkgname-dev $pkgname-utils"
source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
0001-v1.0.0-to-2b74315d.patch
0002-2b74315d-to-b9b2db2f.patch
- 0003-b9b2db2f-to-1974bffa.patch
+ 0003-b9b2db2f-to-efe07b0f.patch
1001-add-basic-dns-record-parsing-functions.patch
getopt_long.c
@@ -117,7 +117,7 @@ crosstool() {
md5sums="e54664fdf211d27737e328c4462b545e musl-1.0.0.tar.gz
d081fc3424229c639e636be2dd00d221 0001-v1.0.0-to-2b74315d.patch
48fa02a48a33bbcb8149edf6540d02f9 0002-2b74315d-to-b9b2db2f.patch
-bdf0786d6c0c5f608000a4819f5bf165 0003-b9b2db2f-to-1974bffa.patch
+b461fa6b4921ddd296795f431a74b8ce 0003-b9b2db2f-to-efe07b0f.patch
a3810683ef61ac27e2f6ec9801280c81 1001-add-basic-dns-record-parsing-functions.patch
61c6c1e84ed1df82abbe6d75e90cf21c getopt_long.c
0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c
@@ -127,7 +127,7 @@ ef81489a6258501cf45db58dfc6d5211 getent
sha256sums="1ad7f45d2972daff19c9e6a92714e6d70f4aad003cd8c3d1e6113432114c1a32 musl-1.0.0.tar.gz
aa632b635d472d5a6a49800899ce34cddc89a63a489690faa683d08622b9cd60 0001-v1.0.0-to-2b74315d.patch
edc0cebaabd16f894d91c1860bfb70d3f2d9a70cf558c5455689610374447f7d 0002-2b74315d-to-b9b2db2f.patch
-fad752a23c837cf3823c4190e932a2a80fa1a20f97d8684c3d5caa143550aa24 0003-b9b2db2f-to-1974bffa.patch
+d524109b51f0c24de58ff32c9b9e64a7f69885c96e52ec71638ebe373959a1e5 0003-b9b2db2f-to-efe07b0f.patch
758390768b1bc4159d56908ca332b9640cd0552ed3b4b2b8d4a6d499c54c11a1 1001-add-basic-dns-record-parsing-functions.patch
d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96 getopt_long.c
299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c
@@ -137,7 +137,7 @@ d6996273f5aaaed429058257e4646b243d9e3a4d8609522f802762453f5be4cb getent
sha512sums="c76cbfe60cbe9b1ceb1faedddf2dcce0f11c942c8f74e4f217efe63e8e1d7be70fcb6cf1182eeaee90441152c4493d678682cb247a0dbc7537d24f943a7bbdf8 musl-1.0.0.tar.gz
e04f0f9de2859d18cb13aa8bfd839cc757aa9d835f133e46b48a760c7e689a92c641abe1e84dcaab6134c22500603e66d9a880f9b80b77e36a063348f5879878 0001-v1.0.0-to-2b74315d.patch
19c09e09d61ba31caeece27ea4241be4f14f73ab958da7f37fc4f0c8391fcaa912a750a2b79c29b3fec24ad22995244c91d1f0372d9b8481c99411e2442c2d4e 0002-2b74315d-to-b9b2db2f.patch
-4065011cbd873421d98f82465fc89c47b357fe4013a3cb34346fcd3d800e8c1028c47a41d400f22721116d0a0f9525a0b2bfc3f953a4b2ffa024d1369549d89c 0003-b9b2db2f-to-1974bffa.patch
+d61f309d10621f7ac330c30c72369697c149de67f264f67fbb666bf748350033bbbe4eceeafd9dca27b277c39707575084a0f2d553682147d35e394494eeae96 0003-b9b2db2f-to-efe07b0f.patch
dad965258daf69371b844f76bfe5a914b0eca0ca76f3fc340b8fd7acf598b5f87bbe6d68b1f43ed0293ee0ed3bfd85d5173ccc169aa6265646248d5b8a906708 1001-add-basic-dns-record-parsing-functions.patch
140f3f20d30bd95ebce8c41b8cc7f616c6cbedf4ea06c729c21014e74f6043796825cc40ebc5180620ea38173afdba23f09ebf6d8b11fa05440b14d23764fca9 getopt_long.c
062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c
--
GitLab