diff options
author | André Draszik <andre.draszik@jci.com> | 2018-03-06 11:01:53 +0200 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-03-06 11:03:09 +0200 |
commit | 3668ba76f44bc778ba4446236088c22948a644d0 (patch) | |
tree | cc3291774f0e41350f22a1e5e0196e08f14500a3 /recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch | |
parent | f8be3065f7c5dbd73516394c0bcd2c7ba1777abf (diff) | |
download | meta-java-3668ba76f44bc778ba4446236088c22948a644d0.tar.gz |
openjdk-8: fix musl build
Add various patches to make it work in musl. Some of them are generic
enough to be applied for all builds, some need to be specific to musl.
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
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, 45 insertions, 0 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 new file mode 100644 index 0000000..68f3d7a --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0009-jdk-disable-backtrace-musl-build-fix.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 8ef989f82b29655e8d4532f14d5aa12a2999d850 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
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 at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
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 | |||