aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-01-21 12:50:58 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-21 12:50:58 +0100
commit12c4dd84c20887dc693c3616865030a962d0e0f0 (patch)
treec7ba1b59b05fab611fa04dcb88eb770f8a0fdffa
parent7fd027f56e1565aedf7854479f42537b591509d0 (diff)
downloadmeta-java-12c4dd84c20887dc693c3616865030a962d0e0f0.tar.gz
meta-java-12c4dd84c20887dc693c3616865030a962d0e0f0.tar.bz2
meta-java-12c4dd84c20887dc693c3616865030a962d0e0f0.zip
icedtea7-native: add patch to fix xattr include path
As attr dropped the <attr/xattr.h> header use <sys/xattr.h> instead. http://git.savannah.nongnu.org/cgit/attr.git/commit/include?id=7921157890d07858d092f4003ca4c6bae9fd2c38 Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-fix-xattr-include.patch11
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/icedtea-m4-fix-xattr-include-path.patch11
-rw-r--r--recipes-core/icedtea/openjdk-7-release-03b147.inc3
3 files changed, 25 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-fix-xattr-include.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-fix-xattr-include.patch
new file mode 100644
index 0000000..9b94dc8
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-fix-xattr-include.patch
@@ -0,0 +1,11 @@
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
++++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+@@ -37,7 +37,7 @@
+
+ #ifdef COMPILE_AGAINST_SYSCALLS
+ #include <sys/types.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #else
+ #include <syscalls_fp.h>
+ #endif
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-m4-fix-xattr-include-path.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-m4-fix-xattr-include-path.patch
new file mode 100644
index 0000000..5164012
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-m4-fix-xattr-include-path.patch
@@ -0,0 +1,11 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2102,7 +2102,7 @@
+ dnl Check for syscalls
+ AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],,
+ [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])])
+- AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h],
++ AC_CHECK_HEADERS([sys/epoll.h sys/xattr.h],
+ , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary.])])
+ fi
+ AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xyes")
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index 2bc7065..9816c0c 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -72,6 +72,7 @@ ICEDTEA_PATCHES = " \
file://icedtea-sane-x86-arch-name.patch \
file://fix-checksums.patch \
file://icedtea-makefile-unzip.patch \
+ file://icedtea-m4-fix-xattr-include-path.patch \
"
OPENJDK_PATCHES = " \
@@ -80,6 +81,7 @@ OPENJDK_PATCHES = " \
file://icedtea-corba-parallel-make.patch;apply=no \
file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \
file://icedtea-jdk-sane-x86-arch.patch;apply=no \
+ file://icedtea-jdk-fix-xattr-include.patch;apply=no \
file://icedtea-flags.patch;apply=no \
file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \
file://icedtea-change-to-gdb-debug-format.patch;apply=no \
@@ -106,6 +108,7 @@ export DISTRIBUTION_PATCHES = " \
patches/icedtea-corba-parallel-make.patch \
patches/icedtea-hotspot-make-arch-sane-for-x86.patch \
patches/icedtea-jdk-sane-x86-arch.patch \
+ patches/icedtea-jdk-fix-xattr-include.patch \
patches/icedtea-flags.patch \
patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
patches/icedtea-change-to-gdb-debug-format.patch \