diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 09:00:08 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 15:11:36 +0200 |
commit | e5510ba991a5494e562776f135fc07f2999a86a8 (patch) | |
tree | 48c5fb5d665af845c4dfd92861dc99aa88b71347 /recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch | |
parent | a599da830cdfe8f50534a8b5d4b8b963b34bc045 (diff) | |
download | meta-java-e5510ba991a5494e562776f135fc07f2999a86a8.tar.gz |
openjdk-8: update to latest ga version 265
Patch related changes:
* The hotspot patch 1004 was mainlined in changeset 3a3803a0c789 [1] and
is therfore dropped.
* The jdk patch 2010 was mainlined in changeset c4418d567028 [2] and is
therefore dropped.
* Rename hotspot/aarch64 patches to start with number 1401.
* Rename hotspot/aarch32 patches to start with number 1201.
* Merge aarch32-hotspot-fix-shark-build-pt2.patch and
openjdk8-fix-shark-build-pt2.patch to hotspot patch 1013 as they were
the same.
[1] https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/3a3803a0c789
[2] https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/c4418d567028
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 | 8 |
1 files changed, 4 insertions, 4 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 dd5e051..84b103c 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 86de5eb9d031e7f8d241725d5eeaa7030cf2ce2b Mon Sep 17 00:00:00 2001 | 1 | From 3848e70f0394c8f633dac1d3ccb7f029fc21fdb2 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/2008] jdk: disable backtrace() (musl build fix) | 4 | Subject: [PATCH 2006/2009] 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 |
@@ -20,7 +20,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | |||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 21 | ||
22 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 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 | 23 | index 2425bf43ae..1c8ebdb42a 100644 |
24 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c | 24 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c |
25 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 25 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c |
26 | @@ -27,7 +27,7 @@ | 26 | @@ -27,7 +27,7 @@ |
@@ -42,5 +42,5 @@ index 2425bf43a..1c8ebdb42 100644 | |||
42 | { | 42 | { |
43 | void *array[10]; | 43 | void *array[10]; |
44 | -- | 44 | -- |
45 | 2.24.1 | 45 | 2.26.2 |
46 | 46 | ||