aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-17 20:24:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-26 11:40:54 +0100
commited208107abb914d39e9e530472301f9f7a60f4c6 (patch)
tree9cb9d1e53abbb03b5f34bf66f84be9d1932e0856
parentd57fbe48390a49a1bb780e2d63533b378ded6831 (diff)
downloadpseudo-ed208107abb914d39e9e530472301f9f7a60f4c6.tar.gz
pseudo-ed208107abb914d39e9e530472301f9f7a60f4c6.tar.bz2
pseudo-ed208107abb914d39e9e530472301f9f7a60f4c6.zip
xattr: adjust for attr 2.4.48 release
Latest versions of attr have removed the xattr.h header, with the rationale that libc is providing the same wrappers. attr/attributes.h is providing the ENOATTR definition. Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xports/linux/subports5
-rw-r--r--ports/linux/xattr/portdefs.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/linux/subports b/ports/linux/subports
index 2c43ac9..740ec83 100755
--- a/ports/linux/subports
+++ b/ports/linux/subports
@@ -29,11 +29,12 @@ fi
if $port_xattr; then
cat > dummy.c <<EOF
#include <sys/types.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
+#include <attr/attributes.h>
int i;
EOF
if ! ${CC} -c -o dummy.o dummy.c >/dev/null 2>&1; then
- echo >&2 "Warning: Can't compile trivial program using <attr/xattr.h>".
+ echo >&2 "Warning: Can't compile trivial program using <attr/attributes.h>".
echo >&2 " xattr support will require that header."
fi
echo "linux/xattr"
diff --git a/ports/linux/xattr/portdefs.h b/ports/linux/xattr/portdefs.h
index 56cd3ca..068d39a 100644
--- a/ports/linux/xattr/portdefs.h
+++ b/ports/linux/xattr/portdefs.h
@@ -2,5 +2,6 @@
* SPDX-License-Identifier: LGPL-2.1-only
*
*/
-#include <attr/xattr.h>
+#include <sys/xattr.h>
+#include <attr/attributes.h>
#include <stdint.h>