diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2019-12-30 15:35:59 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-17 13:02:40 +0200 |
commit | 040bfc7748f37b258f8f1d2c6f1d2d44127bf173 (patch) | |
tree | 4a147312e7398d03f0f8bbffd52f71233fa91957 /recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch | |
parent | 4bcf80651fa555611c13c02eaab3529ccf31bbf6 (diff) | |
download | meta-java-040bfc7748f37b258f8f1d2c6f1d2d44127bf173.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/2006-jdk-disable-backtrace-musl-build-fix.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch new file mode 100644 index 0000000..dd5e051 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 86de5eb9d031e7f8d241725d5eeaa7030cf2ce2b Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 | ||
4 | Subject: [PATCH 2006/2008] jdk: disable backtrace() (musl build fix) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | musl doesn't implement / provide backtrace() and friends or | ||
10 | the corresponding header files. This is all glibc specific. | ||
11 | |||
12 | Use appropriate #ifdef to disable their use on musl and thus | ||
13 | to fix the build on musl. | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
17 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
18 | --- | ||
19 | src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
23 | index 2425bf43a..1c8ebdb42 100644 | ||
24 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
25 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
26 | @@ -27,7 +27,7 @@ | ||
27 | #include <X11/Xutil.h> | ||
28 | #include <X11/Xos.h> | ||
29 | #include <X11/Xatom.h> | ||
30 | -#ifdef __linux__ | ||
31 | +#if defined(__linux__) && defined(__GLIBC__) | ||
32 | #include <execinfo.h> | ||
33 | #endif | ||
34 | |||
35 | @@ -803,7 +803,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv | ||
36 | return ret; | ||
37 | } | ||
38 | |||
39 | -#ifdef __linux__ | ||
40 | +#if defined(__linux__) && defined(__GLIBC__) | ||
41 | void print_stack(void) | ||
42 | { | ||
43 | void *array[10]; | ||
44 | -- | ||
45 | 2.24.1 | ||
46 | |||