summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-14 14:59:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:09 +0000
commit3e9b54ed27b9852d195d8f8192af76948c390836 (patch)
tree9e47e843d9d652b6ff3bcb3078cd2d043740430f /meta/recipes-support/attr/attr/dont-use-decl-macros.patch
parent0e70fac8fe9dab4381e921f110bac301c10a470c (diff)
downloadpoky-3e9b54ed27b9852d195d8f8192af76948c390836.tar.gz
acl/attr: update to latest upstream releases
The latest release use standard autotools, so drop all the build system related hacks and patches. Ptests have been rewritten, with 100% pass rate for both. (From OE-Core rev: 0417eef364bad6d061b6a02bff27d766f4c1ce96) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/attr/attr/dont-use-decl-macros.patch')
-rw-r--r--meta/recipes-support/attr/attr/dont-use-decl-macros.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/meta/recipes-support/attr/attr/dont-use-decl-macros.patch b/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
deleted file mode 100644
index 9d4b8929e8..0000000000
--- a/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1Use extern "C" instead of __BEGIN_DECL/__END_DECL macros
2these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc
3
4anyway they defined like below
5
6#ifdef __cplusplus
7# define __BEGIN_DECLS extern "C" {
8# define __END_DECLS }
9#else
10# define __BEGIN_DECLS /* empty */
11# define __END_DECLS /* empty */
12#endif
13
14__THROW macro is also not available on musl, defined thusly
15
16Upstream-Status: Pending
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19
20Index: attr-2.4.47/include/xattr.h
21===================================================================
22--- attr-2.4.47.orig/include/xattr.h 2014-04-02 00:01:30.252091280 -0700
23+++ attr-2.4.47/include/xattr.h 2014-04-02 00:12:57.985428099 -0700
24@@ -30,8 +30,20 @@
25 #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
26 #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
27
28-
29-__BEGIN_DECLS
30+#ifndef __THROW
31+# ifndef __GNUC_PREREQ
32+# define __GNUC_PREREQ(maj, min) (0)
33+# endif
34+# if defined __cplusplus && __GNUC_PREREQ (2,8)
35+# define __THROW throw ()
36+# else
37+# define __THROW
38+# endif
39+#endif
40+
41+#ifdef __cplusplus
42+extern "C" {
43+#endif
44
45 extern int setxattr (const char *__path, const char *__name,
46 const void *__value, size_t __size, int __flags) __THROW;
47@@ -58,6 +70,8 @@
48 extern int lremovexattr (const char *__path, const char *__name) __THROW;
49 extern int fremovexattr (int __filedes, const char *__name) __THROW;
50
51-__END_DECLS
52+#ifdef __cplusplus
53+}
54+#endif
55
56 #endif /* __XATTR_H__ */