diff options
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 | 14 |
1 files changed, 6 insertions, 8 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..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 86de5eb9d031e7f8d241725d5eeaa7030cf2ce2b 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/2008] 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 2425bf43a..1c8ebdb42 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 @@ |
@@ -32,7 +33,7 @@ index 2425bf43a..1c8ebdb42 100644 | |||
32 | #include <execinfo.h> | 33 | #include <execinfo.h> |
33 | #endif | 34 | #endif |
34 | 35 | ||
35 | @@ -803,7 +803,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv | 36 | @@ -796,7 +796,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv |
36 | return ret; | 37 | return ret; |
37 | } | 38 | } |
38 | 39 | ||
@@ -41,6 +42,3 @@ index 2425bf43a..1c8ebdb42 100644 | |||
41 | void print_stack(void) | 42 | void print_stack(void) |
42 | { | 43 | { |
43 | void *array[10]; | 44 | void *array[10]; |
44 | -- | ||
45 | 2.24.1 | ||
46 | |||