diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-02-14 07:06:52 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-02-14 07:06:52 +0000 |
| commit | 57538d6095cd8dd02c79b5606cc8b797e3eb6dd5 (patch) | |
| tree | 3324992dee02ca58cf313f7ebcd4843a534a7b23 | |
| parent | c8c68e1483283460d011b9896480340418fce938 (diff) | |
| download | aports-57538d6095cd8dd02c79b5606cc8b797e3eb6dd5.tar.bz2 aports-57538d6095cd8dd02c79b5606cc8b797e3eb6dd5.tar.xz | |
main/attr: sync patches with adelie, clean up build()
| -rw-r--r-- | main/attr/APKBUILD | 19 | ||||
| -rw-r--r-- | main/attr/fix-headers.patch | 54 |
2 files changed, 6 insertions, 67 deletions
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD index cf1dd6a6f8..657aaff79e 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=4 +pkgrel=5 pkgdesc="Utilities for managing filesystem extended attributes" url="http://acl.bestbits.at/" arch="all" @@ -10,7 +10,8 @@ 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 + fix-decls.patch + fix-throw.patch " prepare() { @@ -29,12 +30,7 @@ prepare() { build() { cd "$srcdir"/attr-$pkgver - unset PLATFORM #184564 - export OPTIMIZER="${CFLAGS}" - export DEBUG=-DNDEBUG - export INSTALL_USER=root - export INSTALL_GROUP=root - ./configure \ + OPTIMIZER="${CFLAGS}" DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/ \ @@ -70,9 +66,6 @@ libattr() { mv "$pkgdir"/lib/lib*.so.* "$subpkgdir"/lib/ } -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" +fa7925f63c611e39b28adbf8fa3838bd91c245e4694957c1a8e212cb8f289eb62e04f50806227f6c1947d432ddf7633a471c13dd08d513d1e2b8a9ac1906cb33 fix-decls.patch +d758b864bac9bdbc3360df2e7a3bc7d04e06789975cf539b8e2b98b1d874744b55c80f0502e283f7233d6ec41f8a39624fe07b512a7fdc6af8d19dd3af5f9f5a fix-throw.patch" diff --git a/main/attr/fix-headers.patch b/main/attr/fix-headers.patch deleted file mode 100644 index e969f640ee..0000000000 --- a/main/attr/fix-headers.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- 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__ */ |