diff options
| -rw-r--r-- | system/attr/APKBUILD | 33 | ||||
| -rw-r--r-- | system/attr/fix-decls.patch | 35 | ||||
| -rw-r--r-- | system/attr/fix-throw.patch | 33 |
3 files changed, 9 insertions, 92 deletions
diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD index 10fca7144..ac91b0e12 100644 --- a/system/attr/APKBUILD +++ b/system/attr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attr -pkgver=2.4.47 -pkgrel=9 +pkgver=2.4.48 +pkgrel=0 pkgdesc="Utilities for managing filesystem extended attributes" url="https://savannah.nongnu.org/projects/attr" arch="all" @@ -11,9 +11,7 @@ depends="" makedepends="libtool autoconf automake bash gettext-tiny gettext-tiny-dev" checkdepends="perl" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libattr" -source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.src.tar.gz - fix-decls.patch - fix-throw.patch +source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz test-runner-musl.patch test-runner-perl.patch " @@ -21,24 +19,18 @@ source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.src.tar.g prepare() { cd "$builddir" default_prepare - update_config_sub - - sed -i -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in } build() { cd "$builddir" - OPTIMIZER="${CFLAGS}" DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root ./configure \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/ \ + --prefix=/usr \ --exec-prefix=/ \ - --sbindir=/bin \ - --bindir=/usr/bin \ + --sbindir=/sbin \ --libdir=/lib \ - --libexecdir=/usr/lib \ --includedir=/usr/include \ --mandir=/usr/share/man \ --datadir=/usr/share @@ -47,17 +39,12 @@ build() { check() { cd "$builddir" - make tests + make check } package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" \ - install install-lib install-dev - - # provided by man-pages - rm -r "$pkgdir"/usr/share/man/man2 \ - "$pkgdir"/usr/share/man/man5/attr.5 + make -j1 DESTDIR="$pkgdir" install } libattr() { @@ -67,8 +54,6 @@ libattr() { mv "$pkgdir"/lib/lib*.so.* "$subpkgdir"/lib/ } -sha512sums="2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 attr-2.4.47.src.tar.gz -fa7925f63c611e39b28adbf8fa3838bd91c245e4694957c1a8e212cb8f289eb62e04f50806227f6c1947d432ddf7633a471c13dd08d513d1e2b8a9ac1906cb33 fix-decls.patch -d758b864bac9bdbc3360df2e7a3bc7d04e06789975cf539b8e2b98b1d874744b55c80f0502e283f7233d6ec41f8a39624fe07b512a7fdc6af8d19dd3af5f9f5a fix-throw.patch +sha512sums="75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 attr-2.4.48.tar.gz da4b903ae0ba1c72bae60405745c1135d1c3c1cefd7525fca296f8dc7dac1e60e48eeba0ba80fddb035b24b847b00c5a9926d0d586c5d7989d0428e458d977d3 test-runner-musl.patch d10821cc73751171c6b9cc4172cf4c85be9b6e154782090a262a16fd69172a291c5d5c94587aebcf5b5d1e02c27769245d88f0aa86478193cf1a277ac7f4f18e test-runner-perl.patch" diff --git a/system/attr/fix-decls.patch b/system/attr/fix-decls.patch deleted file mode 100644 index 0de70a93d..000000000 --- a/system/attr/fix-decls.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 10 Jan 2014 13:56:37 +0000 -Subject: avoid glibc-specific DECLS defines - -This matches what we do in all the other headers. ---- -diff --git a/include/xattr.h b/include/xattr.h -index 70a84be..070d7c5 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -30,8 +30,9 @@ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #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; -@@ -58,6 +59,8 @@ 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; - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ --- -cgit v0.9.0.2 diff --git a/system/attr/fix-throw.patch b/system/attr/fix-throw.patch deleted file mode 100644 index 220e3ad28..000000000 --- a/system/attr/fix-throw.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001 -From: Emmanuel Dreyfus <manu@netbsd.org> -Date: Mon, 30 Jun 2014 13:06:05 +0000 -Subject: Portability fixes - -- <features.h> is Linux specific -- Define __THROW for non glibc based systems ---- -diff --git a/include/xattr.h b/include/xattr.h -index 070d7c5..fd1f268 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -20,7 +20,18 @@ - #ifndef __XATTR_H__ - #define __XATTR_H__ - -+#if defined(linux) - #include <features.h> -+#endif -+ -+/* Portability non glibc c++ build systems */ -+#ifndef __THROW -+# if defined __cplusplus -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif - - #include <errno.h> - #ifndef ENOATTR --- -cgit v0.9.0.2 |