From 8ef989f82b29655e8d4532f14d5aa12a2999d850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Fri, 2 Mar 2018 13:58:07 +0000 Subject: [PATCH 10/10] jdk: disable backtrace() (musl build fix) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit musl doesn't implement / provide backtrace() and friends or the corresponding header files. This is all glibc specific. Use appropriate #ifdef to disable their use on musl and thus to fix the build on musl. Upstream-Status: Pending Signed-off-by: André Draszik --- jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c index 71d41f37..d3dc47cb 100644 --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c @@ -27,7 +27,7 @@ #include #include #include -#ifdef __linux__ +#if defined(__linux__) && defined(__GLIBC__) #include #endif @@ -799,7 +799,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv return ret; } -#ifdef __linux__ +#if defined(__linux__) && defined(__GLIBC__) void print_stack(void) { void *array[10]; -- 2.16.2