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 | 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 | |||