From 4831525c035533313ef2482bc3302ebe1ed74638 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 1 Mar 2013 20:31:02 +0100 Subject: [PATCH] attr: remove useless libtool archives; musl support. --- .../attr/patches/xattr_h_portability.patch | 55 +++++++++++++++++++ srcpkgs/attr/template | 5 +- 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/attr/patches/xattr_h_portability.patch diff --git a/srcpkgs/attr/patches/xattr_h_portability.patch b/srcpkgs/attr/patches/xattr_h_portability.patch new file mode 100644 index 00000000000..14e97638217 --- /dev/null +++ b/srcpkgs/attr/patches/xattr_h_portability.patch @@ -0,0 +1,55 @@ +--- include/xattr.h.orig 2013-03-01 20:24:44.620880695 +0100 ++++ include/xattr.h 2013-03-01 20:26:28.802885344 +0100 +@@ -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; +- +-__END_DECLS ++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); ++ ++#ifdef __cplusplus ++} ++#endif + + #endif /* __XATTR_H__ */ diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template index 1a1ce03f31a..35868bd97dc 100644 --- a/srcpkgs/attr/template +++ b/srcpkgs/attr/template @@ -1,8 +1,9 @@ # Template file for 'attr' pkgname=attr version=2.4.46 -revision=5 +revision=6 build_style=gnu-configure +subpackages="attr-devel attr-progs" configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" make_install_target="DIST_ROOT=${XBPS_DESTDIR}/${pkgname}-${version} install install-lib install-dev" short_desc="Extended attribute support library for ACL support" @@ -11,5 +12,3 @@ homepage="http://savannah.nongnu.org/projects/attr" license="LGPL-2.1" distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz" checksum=dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f -keep_libtool_archives=yes -subpackages="attr-devel attr-progs"