diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2019-12-30 15:35:59 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-01-27 11:02:06 +0100 |
commit | cb6eedeb1f7fa877497e6ff2aa893e8089fe6541 (patch) | |
tree | ba4b6977735e331c5cb6a7585a185fba895f2dc7 /recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | |
parent | 19b569281cc30e3aa94e772d6885cd340b1d1724 (diff) | |
download | meta-java-cb6eedeb1f7fa877497e6ff2aa893e8089fe6541.tar.gz |
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build"
version the recipes are adapted to use those "ga" versions.
All existing patches got re-applied and renamed. For better handling Hotspot
patches now start at patch number 1001 and jdk patches at 2001.
Furthermore architecture dependent patches are prefixed with the
architecture they apply on.
Following patches/hunks were completely dropped:
- 0002-hotspot-fix-compilation-with-security-flags-enabled.patch
got backported to hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185
- 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
ostream.cpp:112 got fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502
- 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch
got backported to hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916
- 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd
- 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c
- openjdk8-add-missing-linker-flags.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a
- openjdk8-fix-shark-stdc++11.patch
fixed in hotspot jdk8u
- openjdk8-fix-libpng-neon-build.patch
fixed in jdk
https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1
- aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch
got backported to hotspot jdk8u
Following patches were newly added:
- 0011-autoconf-fix-CC-with-arguments-detection.patch
needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris"
- 0012-autoconf-NativeCompilation-remove-sysroot.patch
needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris"
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch new file mode 100644 index 0000000..3f678dd --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | |||
@@ -0,0 +1,87 @@ | |||
1 | From df566df123c8af8252c0e113c41c32482834923e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | ||
4 | Subject: [PATCH 1002/1012] hotspot: use correct include for poll | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Compiling against musl-libc gives the following warning (which is | ||
10 | treated as error due to -Werror): | ||
11 | .../recipe-sysroot/usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Werror=cpp] | ||
12 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h> | ||
13 | ^~~~~~~ | ||
14 | etc. | ||
15 | |||
16 | To use poll(), poll.h needs to be included, even on glibc - do so using | ||
17 | the following command: | ||
18 | for i in $(git grep sys/poll\.h hotspot | cut -f 1 -d : | sort -u) ; do | ||
19 | sed -e 's,sys/poll\.h,poll.h,g' -i ${i} | ||
20 | done | ||
21 | |||
22 | Upstream-Status: Pending | ||
23 | |||
24 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
25 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
26 | --- | ||
27 | src/os/aix/vm/os_aix.inline.hpp | 2 +- | ||
28 | src/os/bsd/vm/os_bsd.inline.hpp | 2 +- | ||
29 | src/os/linux/vm/os_linux.inline.hpp | 2 +- | ||
30 | src/os/solaris/vm/os_solaris.inline.hpp | 2 +- | ||
31 | 4 files changed, 4 insertions(+), 4 deletions(-) | ||
32 | |||
33 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp | ||
34 | index 421ea342e..9a1e1e096 100644 | ||
35 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp | ||
36 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp | ||
37 | @@ -34,7 +34,7 @@ | ||
38 | |||
39 | #include <unistd.h> | ||
40 | #include <sys/socket.h> | ||
41 | -#include <sys/poll.h> | ||
42 | +#include <poll.h> | ||
43 | #include <sys/ioctl.h> | ||
44 | #include <netdb.h> | ||
45 | |||
46 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | ||
47 | index c35abf486..8ff584aee 100644 | ||
48 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | ||
49 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | ||
50 | @@ -33,7 +33,7 @@ | ||
51 | |||
52 | #include <unistd.h> | ||
53 | #include <sys/socket.h> | ||
54 | -#include <sys/poll.h> | ||
55 | +#include <poll.h> | ||
56 | #include <netdb.h> | ||
57 | |||
58 | inline void* os::thread_local_storage_at(int index) { | ||
59 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp | ||
60 | index a23bd5631..9d56de0ef 100644 | ||
61 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp | ||
62 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp | ||
63 | @@ -33,7 +33,7 @@ | ||
64 | |||
65 | #include <unistd.h> | ||
66 | #include <sys/socket.h> | ||
67 | -#include <sys/poll.h> | ||
68 | +#include <poll.h> | ||
69 | #include <netdb.h> | ||
70 | |||
71 | inline void* os::thread_local_storage_at(int index) { | ||
72 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | ||
73 | index 8e095ab69..ce37e9a12 100644 | ||
74 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | ||
75 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | ||
76 | @@ -33,7 +33,7 @@ | ||
77 | #include <sys/param.h> | ||
78 | #include <dlfcn.h> | ||
79 | #include <sys/socket.h> | ||
80 | -#include <sys/poll.h> | ||
81 | +#include <poll.h> | ||
82 | #include <sys/filio.h> | ||
83 | #include <unistd.h> | ||
84 | #include <netdb.h> | ||
85 | -- | ||
86 | 2.24.1 | ||
87 | |||