diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch deleted file mode 100644 index 43130b5..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 8ef989f82b29655e8d4532f14d5aa12a2999d850 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 10/10] 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 | --- | ||
18 | jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- | ||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
22 | index 71d41f37..d3dc47cb 100644 | ||
23 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
24 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
25 | @@ -27,7 +27,7 @@ | ||
26 | #include <X11/Xutil.h> | ||
27 | #include <X11/Xos.h> | ||
28 | #include <X11/Xatom.h> | ||
29 | -#ifdef __linux__ | ||
30 | +#if defined(__linux__) && defined(__GLIBC__) | ||
31 | #include <execinfo.h> | ||
32 | #endif | ||
33 | |||
34 | @@ -799,7 +799,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv | ||
35 | return ret; | ||
36 | } | ||
37 | |||
38 | -#ifdef __linux__ | ||
39 | +#if defined(__linux__) && defined(__GLIBC__) | ||
40 | void print_stack(void) | ||
41 | { | ||
42 | void *array[10]; | ||
43 | -- | ||
44 | 2.16.2 | ||
45 | |||