summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/attr/files
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-11-14 13:00:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:01 +0000
commit88825076d24d63f39efe9678900fa31e6c4b5fe9 (patch)
tree3f75fab9b786ae0d86b53eda2296a433f8ba1119 /meta/recipes-support/attr/files
parent929787c271a620ed9b564a0ad225d543237febf3 (diff)
downloadpoky-88825076d24d63f39efe9678900fa31e6c4b5fe9.tar.gz
attr: move attr-specific patches into attr/
(From OE-Core rev: 75ecb106dcf7d7e9b5634562a234acee123f4af6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/attr/files')
-rw-r--r--meta/recipes-support/attr/files/attr-Missing-configure.ac.patch63
-rw-r--r--meta/recipes-support/attr/files/dont-use-decl-macros.patch56
2 files changed, 0 insertions, 119 deletions
diff --git a/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch b/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch
deleted file mode 100644
index 20fcc3cee7..0000000000
--- a/meta/recipes-support/attr/files/attr-Missing-configure.ac.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Subject: [PATCH] attr: Missing configure.ac
2
3Upstream-Status: Backport [Upstream released tarball missing this file]
4Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
5---
6 configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
7 1 file changed, 48 insertions(+)
8 create mode 100644 configure.ac
9
10diff --git a/configure.ac b/configure.ac
11new file mode 100644
12index 0000000..b966d0e
13--- /dev/null
14+++ b/configure.ac
15@@ -0,0 +1,48 @@
16+# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
17+#
18+# This program is free software: you can redistribute it and/or modify it
19+# under the terms of the GNU General Public License as published by
20+# the Free Software Foundation, either version 2 of the License, or
21+# (at your option) any later version.
22+#
23+# This program is distributed in the hope that it will be useful,
24+# but WITHOUT ANY WARRANTY; without even the implied warranty of
25+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26+# GNU General Public License for more details.
27+#
28+# You should have received a copy of the GNU General Public License
29+# along with this program. If not, see <http://www.gnu.org/licenses/>.
30+#
31+AC_INIT(include/attributes.h)
32+AC_CONFIG_AUX_DIR([.])
33+AC_CONFIG_MACRO_DIR([m4])
34+AC_CONFIG_HEADER(include/config.h)
35+AC_PREFIX_DEFAULT(/usr)
36+
37+AC_PROG_LIBTOOL
38+
39+AC_ARG_ENABLE(shared,
40+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
41+ enable_shared=yes)
42+AC_SUBST(enable_shared)
43+
44+AC_ARG_ENABLE(gettext,
45+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
46+ enable_gettext=yes)
47+AC_SUBST(enable_gettext)
48+
49+AC_ARG_ENABLE(lib64,
50+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
51+ enable_lib64=no)
52+AC_SUBST(enable_lib64)
53+
54+AC_PACKAGE_GLOBALS(attr)
55+AC_PACKAGE_UTILITIES(attr)
56+AC_MANUAL_FORMAT
57+AC_MULTILIB($enable_lib64)
58+
59+AC_C_CONST
60+AC_TYPE_MODE_T
61+AC_FUNC_ALLOCA
62+
63+AC_OUTPUT(include/builddefs)
diff --git a/meta/recipes-support/attr/files/dont-use-decl-macros.patch b/meta/recipes-support/attr/files/dont-use-decl-macros.patch
deleted file mode 100644
index 9d4b8929e8..0000000000
--- a/meta/recipes-support/attr/files/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__ */