diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-02-14 07:08:18 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-02-14 07:08:18 +0000 |
| commit | f756f04e4a3ff1233903ad428e943498d9eb0814 (patch) | |
| tree | 7d4d06582d106c3b697c4f61ff1cd3893a839f28 /main/attr | |
| parent | 57538d6095cd8dd02c79b5606cc8b797e3eb6dd5 (diff) | |
| download | aports-f756f04e4a3ff1233903ad428e943498d9eb0814.tar.bz2 aports-f756f04e4a3ff1233903ad428e943498d9eb0814.tar.xz | |
main/attr: helps to actually add the patches, doesn't it
Diffstat (limited to 'main/attr')
| -rw-r--r-- | main/attr/fix-decls.patch | 35 | ||||
| -rw-r--r-- | main/attr/fix-throw.patch | 33 |
2 files changed, 68 insertions, 0 deletions
diff --git a/main/attr/fix-decls.patch b/main/attr/fix-decls.patch new file mode 100644 index 0000000000..0de70a93d0 --- /dev/null +++ b/main/attr/fix-decls.patch @@ -0,0 +1,35 @@ +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/main/attr/fix-throw.patch b/main/attr/fix-throw.patch new file mode 100644 index 0000000000..220e3ad28a --- /dev/null +++ b/main/attr/fix-throw.patch @@ -0,0 +1,33 @@ +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 |