mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

attr: Add patch to account for use of internal glibc header

Browse Source 
based on suggestions on musl FAQ
http://wiki.musl-libc.org/wiki/FAQ

(From OE-Core rev: 2544153a370208e9a08a506f4d5afe56d203e242)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2015-11-19 01:07:21 +00:00
committed by Richard Purdie
parent f1c034be02
commit 2c11bdd5ca
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-support/attr/attr_2.4.47.bb
View File

@@ -2,7 +2,9 @@ require attr.inc
# configure.ac was missing from the release tarball. This should be fixed in
# future releases of attr, remove this when updating the recipe.
SRC_URI_append += "file://attr-Missing-configure.ac.patch"
SRC_URI_append += "file://attr-Missing-configure.ac.patch \
file://dont-use-decl-macros.patch \
"
SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7"
SRC_URI[sha256sum] = "25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859"

56
meta/recipes-support/attr/files/dont-use-decl-macros.patch Normal file
View File

@@ -0,0 +1,56 @@
Use extern "C" instead of __BEGIN_DECL/__END_DECL macros
these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc
anyway they defined like below
#ifdef __cplusplus
# define __BEGIN_DECLS extern "C" {
# define __END_DECLS }
#else
# define __BEGIN_DECLS /* empty */
# define __END_DECLS /* empty */
#endif
__THROW macro is also not available on musl, defined thusly
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: attr-2.4.47/include/xattr.h
===================================================================
--- attr-2.4.47.orig/include/xattr.h 2014-04-02 00:01:30.252091280 -0700
+++ attr-2.4.47/include/xattr.h 2014-04-02 00:12:57.985428099 -0700
@@ -30,8 +30,20 @@
#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
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+# define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+# define __THROW throw ()
+# else
+# define __THROW
+# endif
+#endif
+
+#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 +70,8 @@
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__ */