diff options
author | Geoff Parker <geoffrey.parker@arthrex.com> | 2023-05-01 19:26:20 -0700 |
---|---|---|
committer | Richard <g0hl1n@users.noreply.github.com> | 2023-05-02 09:02:27 +0200 |
commit | bf6ae1dac46dc9894f206c7f81570548dbf6785c (patch) | |
tree | 6cffa5a73f21963c52034d5dc5f66f8d935e3d96 /recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch | |
parent | e122acf3e9570ceb055e55feb41e5558463253e4 (diff) | |
download | meta-java-bf6ae1dac46dc9894f206c7f81570548dbf6785c.tar.gz |
openjdk-8: Update patches for patch fuzz for Yocto 4.2 mickledore
Yocto 4.2 bitbake is more pedantic on patch fuzz, which treats
patch fuzz Warnings as Errors, and fails the bulid.
Corrected patch fuzz with:
devtool modify openjdk-8-native
devtool finish --force-patch-refresh openjdk-8-native <meta-java layer_path>
but removed the changes to 1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch
which rewrote a huge amount of source files in their entirety for some reason.
Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.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 | 12 |
1 files changed, 5 insertions, 7 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 index 6f9c174..4773f20 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From 80a07db16d9de0cd875b9c8e86678a51b6e75dbf Mon Sep 17 00:00:00 2001 | 1 | From f27d54f62c5a5667c04b78ea1434a5db36358261 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 | 3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 |
4 | Subject: [PATCH 2006/2009] jdk: disable backtrace() (musl build fix) | 4 | Subject: [PATCH] jdk: disable backtrace() (musl build fix) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -15,12 +15,13 @@ to fix the build on musl. | |||
15 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
16 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 16 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
17 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 17 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
18 | |||
18 | --- | 19 | --- |
19 | src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- | 20 | jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- |
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 21 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 22 | ||
22 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 23 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c |
23 | index 95d2baff5b..41dfa992a7 100644 | 24 | index 95d2baff..41dfa992 100644 |
24 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c | 25 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c |
25 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 26 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c |
26 | @@ -27,7 +27,7 @@ | 27 | @@ -27,7 +27,7 @@ |
@@ -41,6 +42,3 @@ index 95d2baff5b..41dfa992a7 100644 | |||
41 | void print_stack(void) | 42 | void print_stack(void) |
42 | { | 43 | { |
43 | void *array[10]; | 44 | void *array[10]; |
44 | -- | ||
45 | 2.26.2 | ||
46 | |||