From a69a5f0212117b420ce782a7a25a47a6ead91009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 6 Sep 2013 10:54:16 +0000
Subject: main/attr: fix musl build

---
 main/attr/APKBUILD          | 17 +++++++++-----
 main/attr/fix-headers.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 main/attr/fix-headers.patch

diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index c17cdd4f8..bb9ec51f1 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=attr
 pkgver=2.4.47
-pkgrel=0
+pkgrel=1
 pkgdesc="Utilities for managing filesystem extended attributes"
 url="http://acl.bestbits.at/"
 arch="all"
@@ -10,10 +10,12 @@ depends=
 makedepends="libtool autoconf automake bash gzip"
 subpackages="$pkgname-dev $pkgname-doc libattr"
 source="http://download.savannah.gnu.org/releases-noredirect/attr/attr-$pkgver.src.tar.gz
+	fix-headers.patch
 	"
 
 prepare() {
 	cd "$srcdir"/attr-$pkgver
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -46,12 +48,12 @@ build() {
 		--datadir=/usr/share \
 		--disable-gettext \
 		|| return 1
-	make LIBTOOL="libtool --tag=CC" || return 1
+	make || return 1
 }
 
 package() {
 	cd "$srcdir"/attr-$pkgver
-	make -j1 LIBTOOL=$PWD/libtool DESTDIR="$pkgdir" \
+	make -j1 DESTDIR="$pkgdir" \
 		install install-lib install-dev || return 1
 	# provided by man-pages
 	rm -r "$pkgdir"/usr/share/man/man2 \
@@ -65,6 +67,9 @@ libattr() {
 	mv "$pkgdir"/lib/lib*.so.* "$subpkgdir"/lib/
 }
 
-md5sums="84f58dec00b60f2dc8fd1c9709291cc7  attr-2.4.47.src.tar.gz"
-sha256sums="25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859  attr-2.4.47.src.tar.gz"
-sha512sums="2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831  attr-2.4.47.src.tar.gz"
+md5sums="84f58dec00b60f2dc8fd1c9709291cc7  attr-2.4.47.src.tar.gz
+25d1b2496593f5bc67afd576b7d1457a  fix-headers.patch"
+sha256sums="25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859  attr-2.4.47.src.tar.gz
+53b669f9fb365961aa393a8528c1d671c76a2687c6d7f3b171335bd902feca3e  fix-headers.patch"
+sha512sums="2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831  attr-2.4.47.src.tar.gz
+7e8186f643b5c891111c927f5026f35dee550c5520e65c61d5121921865d3bbf05e42c3b218be171802a790aca5c0498d8516970625cb5cd369e63075cb80737  fix-headers.patch"
diff --git a/main/attr/fix-headers.patch b/main/attr/fix-headers.patch
new file mode 100644
index 000000000..e969f640e
--- /dev/null
+++ b/main/attr/fix-headers.patch
@@ -0,0 +1,54 @@
+--- attr-2.4.47/include/xattr.h
++++ attr-2.4.47/include/xattr.h
+@@ -31,33 +31,37 @@
+ #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
+ 
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ extern int setxattr (const char *__path, const char *__name,
+-		      const void *__value, size_t __size, int __flags) __THROW;
++		      const void *__value, size_t __size, int __flags);
+ extern int lsetxattr (const char *__path, const char *__name,
+-		      const void *__value, size_t __size, int __flags) __THROW;
++		      const void *__value, size_t __size, int __flags);
+ extern int fsetxattr (int __filedes, const char *__name,
+-		      const void *__value, size_t __size, int __flags) __THROW;
++		      const void *__value, size_t __size, int __flags);
+ 
+ extern ssize_t getxattr (const char *__path, const char *__name,
+-				void *__value, size_t __size) __THROW;
++				void *__value, size_t __size);
+ extern ssize_t lgetxattr (const char *__path, const char *__name,
+-				void *__value, size_t __size) __THROW;
++				void *__value, size_t __size);
+ extern ssize_t fgetxattr (int __filedes, const char *__name,
+-				void *__value, size_t __size) __THROW;
++				void *__value, size_t __size);
+ 
+ extern ssize_t listxattr (const char *__path, char *__list,
+-				size_t __size) __THROW;
++				size_t __size);
+ extern ssize_t llistxattr (const char *__path, char *__list,
+-				size_t __size) __THROW;
++				size_t __size);
+ extern ssize_t flistxattr (int __filedes, char *__list,
+-				size_t __size) __THROW;
++				size_t __size);
+ 
+-extern int removexattr (const char *__path, const char *__name) __THROW;
+-extern int lremovexattr (const char *__path, const char *__name) __THROW;
+-extern int fremovexattr (int __filedes,   const char *__name) __THROW;
++extern int removexattr (const char *__path, const char *__name);
++extern int lremovexattr (const char *__path, const char *__name);
++extern int fremovexattr (int __filedes,   const char *__name);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif	/* __XATTR_H__ */
-- 
cgit v1.2.3