mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-21 12:21:43 +02:00
166ad0377b
ref #4515 openjdk8 and openjdk7 cannot coexist currently due to automatic so dependencies. both packages should be fixed to not provide conflicting so deps (or maybe needs abuild change?)
21 lines
503 B
Diff
21 lines
503 B
Diff
--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c
|
|
+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
|
|
@@ -27,7 +27,7 @@
|
|
#include <X11/Xutil.h>
|
|
#include <X11/Xos.h>
|
|
#include <X11/Xatom.h>
|
|
-#ifdef __linux__
|
|
+#if defined(__linux__) && defined(__GLIBC__) && ! defined(__UCLIBC__)
|
|
#include <execinfo.h>
|
|
#endif
|
|
|
|
@@ -689,7 +689,7 @@
|
|
return ret;
|
|
}
|
|
|
|
-#ifdef __linux__
|
|
+#if defined(__linux__) && defined(__GLIBC__) && ! defined(__UCLIBC__)
|
|
void print_stack(void)
|
|
{
|
|
void *array[10];
|