summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-01-21 14:46:07 (GMT)
committerRichard Leitner <richard.leitner@skidata.com>2020-01-21 14:46:07 (GMT)
commit90c1f4955249381c56b0e8a7bac73a8fe82e67a7 (patch)
tree80961629b93f3ffb79c4c9c4878d7b145af9765c
parent12c4dd84c20887dc693c3616865030a962d0e0f0 (diff)
downloadmeta-java-90c1f4955249381c56b0e8a7bac73a8fe82e67a7.tar.gz
openjdk-7: 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/openjdk/openjdk-7_99b00-2.6.5.bb3
-rw-r--r--recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-fix-xattr-include.patch11
-rw-r--r--recipes-core/openjdk/patches-openjdk-7/icedtea-m4-fix-xattr-include-path.patch11
3 files changed, 25 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
index 87de6be..d774cc2 100644
--- a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
+++ b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
@@ -41,6 +41,7 @@ OEPATCHES = "\
41 file://build-hacks.patch \ 41 file://build-hacks.patch \
42 file://fix_hotspot_crosscompile.patch \ 42 file://fix_hotspot_crosscompile.patch \
43 file://icedtea-makefile-unzip.patch \ 43 file://icedtea-makefile-unzip.patch \
44 file://icedtea-m4-fix-xattr-include-path.patch \
44" 45"
45 46
46ICEDTEAPATCHES = "\ 47ICEDTEAPATCHES = "\
@@ -50,6 +51,7 @@ ICEDTEAPATCHES = "\
50 file://icedtea-crosscompile-fix.patch;apply=no \ 51 file://icedtea-crosscompile-fix.patch;apply=no \
51 file://icedtea-xawt-crosscompile-fix.patch;apply=no \ 52 file://icedtea-xawt-crosscompile-fix.patch;apply=no \
52 file://icedtea-jdk-unzip.patch;apply=no \ 53 file://icedtea-jdk-unzip.patch;apply=no \
54 file://icedtea-jdk-fix-xattr-include.patch;apply=no \
53 file://icedtea-dtrace-std_h.patch;apply=no \ 55 file://icedtea-dtrace-std_h.patch;apply=no \
54 file://icedtea-hotspot-fix-string-literal-marcos.patch;apply=no \ 56 file://icedtea-hotspot-fix-string-literal-marcos.patch;apply=no \
55 file://icedtea-flags-to-compile-with-GCC-6.patch;apply=no \ 57 file://icedtea-flags-to-compile-with-GCC-6.patch;apply=no \
@@ -63,6 +65,7 @@ DISTRIBUTION_PATCHES = "\
63 patches/icedtea-crosscompile-fix.patch \ 65 patches/icedtea-crosscompile-fix.patch \
64 patches/icedtea-xawt-crosscompile-fix.patch \ 66 patches/icedtea-xawt-crosscompile-fix.patch \
65 patches/icedtea-jdk-unzip.patch \ 67 patches/icedtea-jdk-unzip.patch \
68 patches/icedtea-jdk-fix-xattr-include.patch \
66 patches/icedtea-dtrace-std_h.patch \ 69 patches/icedtea-dtrace-std_h.patch \
67 patches/icedtea-hotspot-fix-string-literal-marcos.patch \ 70 patches/icedtea-hotspot-fix-string-literal-marcos.patch \
68 patches/icedtea-flags-to-compile-with-GCC-6.patch \ 71 patches/icedtea-flags-to-compile-with-GCC-6.patch \
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-fix-xattr-include.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-fix-xattr-include.patch
new file mode 100644
index 0000000..ef44e7e
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-fix-xattr-include.patch
@@ -0,0 +1,11 @@
1--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
2+++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
3@@ -38,7 +38,7 @@
4
5 #ifdef COMPILE_AGAINST_SYSCALLS
6 #include <sys/types.h>
7-#include <attr/xattr.h>
8+#include <sys/xattr.h>
9 #else
10 #include <syscalls_fp.h>
11 #endif
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-m4-fix-xattr-include-path.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-m4-fix-xattr-include-path.patch
new file mode 100644
index 0000000..f9b526f
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-m4-fix-xattr-include-path.patch
@@ -0,0 +1,11 @@
1--- a/acinclude.m4
2+++ b/acinclude.m4
3@@ -2234,7 +2234,7 @@
4 dnl Check for syscalls
5 AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],,
6 [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])])
7- AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h],
8+ AC_CHECK_HEADERS([sys/epoll.h sys/xattr.h],
9 , [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.])])
10 ENABLE_SYSCALL_COMPILATION=true
11 fi