aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-18 13:52:13 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-18 13:52:44 +0000
commitb970a11ce18b9413167dcf8904c0a673240be46c (patch)
tree9b3cd071c3efd73e9465bd8ec855dbd7a64b248f
parent211f26ed8b6729fd1e9e2ece00aa4dea0f6b3c12 (diff)
downloadaports-b970a11ce18b9413167dcf8904c0a673240be46c.tar.bz2
aports-b970a11ce18b9413167dcf8904c0a673240be46c.tar.xz
main/libc-dev: ship sys/cdefs.h for musl
-rw-r--r--main/libc-dev/APKBUILD15
-rw-r--r--main/libc-dev/sys-cdefs.h24
2 files changed, 34 insertions, 5 deletions
diff --git a/main/libc-dev/APKBUILD b/main/libc-dev/APKBUILD
index 2e76d68e48..2e5f34269d 100644
--- a/main/libc-dev/APKBUILD
+++ b/main/libc-dev/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libc-dev
-pkgver=0.4
+pkgver=0.5
pkgrel=0
pkgdesc="Meta package to pull in correct libc"
url="http://alpinelinux.org"
@@ -12,7 +12,8 @@ makedepends_host=" "
makedepends="$makedepends_build $makedepends_host"
depends="$CLIBC-dev"
subpackages="libc-utils:utils"
-source="sys-queue.h
+source="sys-cdefs.h
+ sys-queue.h
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -31,6 +32,7 @@ package() {
case "$CLIBC" in
musl)
depends="$depends linux-headers"
+ install -D "$srcdir"/sys-cdefs.h "$pkgdir"/usr/include/sys/cdefs.h
install -D "$srcdir"/sys-queue.h "$pkgdir"/usr/include/sys/queue.h
;;
esac
@@ -42,6 +44,9 @@ utils() {
mkdir -p "$subpkgdir"
}
-md5sums="555be8a6d1523a2272f4a04e4e936d5e sys-queue.h"
-sha256sums="e4db36f500692efb12a7b97112e0f5c0985f13310a052d8e9f3a4f7648693711 sys-queue.h"
-sha512sums="af87b810fbc4e7ed97b20412025ff5766e503fec163b27c81415dc0377b4f80f39548ebf8b6403e0dc5d35eddf8d08ba2a8dc549b3c8c1bf503c9da7c24b523b sys-queue.h"
+md5sums="13aa756878e3c6baa74a59e078514809 sys-cdefs.h
+555be8a6d1523a2272f4a04e4e936d5e sys-queue.h"
+sha256sums="a83818007069c222d24d283a99348c2376f35bac3282d8142004c47d3dc5ecac sys-cdefs.h
+e4db36f500692efb12a7b97112e0f5c0985f13310a052d8e9f3a4f7648693711 sys-queue.h"
+sha512sums="4e6ecdd3e7cf02cff3cab7931cbd4c06d7be54ea77bea8280154ba3f81d158445c9b7a8404fc3ed0595f11f85f270c276f59ecbf40e75d2b9cf0a5245b81823b sys-cdefs.h
+af87b810fbc4e7ed97b20412025ff5766e503fec163b27c81415dc0377b4f80f39548ebf8b6403e0dc5d35eddf8d08ba2a8dc549b3c8c1bf503c9da7c24b523b sys-queue.h"
diff --git a/main/libc-dev/sys-cdefs.h b/main/libc-dev/sys-cdefs.h
new file mode 100644
index 0000000000..a60f0e2ae0
--- /dev/null
+++ b/main/libc-dev/sys-cdefs.h
@@ -0,0 +1,24 @@
+#undef __P
+#undef __PMT
+
+#define __P(args) args
+#define __PMT(args) args
+
+#define __CONCAT(x,y) x ## y
+#define __STRING(x) #x
+
+#ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+#else
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
+#if defined(__GNUC__) && !defined(__cplusplus)
+# define __THROW __attribute__ ((__nothrow__))
+# define __NTH(fct) __attribute__ ((__nothrow__)) fct
+#else
+# define __THROW
+# define __NTH(fct) fct
+#endif