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-28 15:09:31 +0100 |
commit | 7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch) | |
tree | 398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch | |
parent | 19b569281cc30e3aa94e772d6885cd340b1d1724 (diff) | |
download | meta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.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"
Additionally add UPDATING.md which describes the openjdk8 update process
for this layer and update8checksums.sh, a script that updates the
openjdk8 source archive checksums in the corresponding .inc files.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch deleted file mode 100644 index 45573e4..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | From 79e35bd203b40979e1d241a04d6d9df373327bef 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 5/9] 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 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
24 | --- | ||
25 | hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- | ||
26 | hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- | ||
27 | hotspot/src/os/linux/vm/os_linux.inline.hpp | 2 +- | ||
28 | hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 2 +- | ||
29 | 4 files changed, 4 insertions(+), 4 deletions(-) | ||
30 | |||
31 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp | ||
32 | index a97c94c0..e2974ee1 100644 | ||
33 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp | ||
34 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp | ||
35 | @@ -34,7 +34,7 @@ | ||
36 | |||
37 | #include <unistd.h> | ||
38 | #include <sys/socket.h> | ||
39 | -#include <sys/poll.h> | ||
40 | +#include <poll.h> | ||
41 | #include <sys/ioctl.h> | ||
42 | #include <netdb.h> | ||
43 | |||
44 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | ||
45 | index 10b39941..3144a29c 100644 | ||
46 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | ||
47 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | ||
48 | @@ -33,7 +33,7 @@ | ||
49 | |||
50 | #include <unistd.h> | ||
51 | #include <sys/socket.h> | ||
52 | -#include <sys/poll.h> | ||
53 | +#include <poll.h> | ||
54 | #include <netdb.h> | ||
55 | |||
56 | inline void* os::thread_local_storage_at(int index) { | ||
57 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp | ||
58 | index 10d56d89..b9b2b775 100644 | ||
59 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp | ||
60 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp | ||
61 | @@ -33,7 +33,7 @@ | ||
62 | |||
63 | #include <unistd.h> | ||
64 | #include <sys/socket.h> | ||
65 | -#include <sys/poll.h> | ||
66 | +#include <poll.h> | ||
67 | #include <netdb.h> | ||
68 | |||
69 | inline void* os::thread_local_storage_at(int index) { | ||
70 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | ||
71 | index 921fcf7c..5d80a7d0 100644 | ||
72 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | ||
73 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | ||
74 | @@ -33,7 +33,7 @@ | ||
75 | #include <sys/param.h> | ||
76 | #include <dlfcn.h> | ||
77 | #include <sys/socket.h> | ||
78 | -#include <sys/poll.h> | ||
79 | +#include <poll.h> | ||
80 | #include <sys/filio.h> | ||
81 | #include <unistd.h> | ||
82 | #include <netdb.h> | ||
83 | -- | ||
84 | 2.16.2 | ||
85 | |||