diff options
author | William Pitcock <nenolod@dereferenced.org> | 2011-03-28 19:52:39 -0500 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2011-03-28 19:52:39 -0500 |
commit | 44c939369e9f5d2aae6463e2cde329f76ffbf427 (patch) | |
tree | cf20ed16a2b255eaab158ecf625d205e6680194c /main/openjdk6/icedtea-jdk-execinfo.patch | |
parent | a1e9d96005522a2efc85ab7d70bf0089d965a145 (diff) | |
download | aports-44c939369e9f5d2aae6463e2cde329f76ffbf427.tar.bz2 aports-44c939369e9f5d2aae6463e2cde329f76ffbf427.tar.xz |
testing/openjdk6: promote to main
Diffstat (limited to 'main/openjdk6/icedtea-jdk-execinfo.patch')
-rw-r--r-- | main/openjdk6/icedtea-jdk-execinfo.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/main/openjdk6/icedtea-jdk-execinfo.patch b/main/openjdk6/icedtea-jdk-execinfo.patch new file mode 100644 index 0000000000..fb17ab6927 --- /dev/null +++ b/main/openjdk6/icedtea-jdk-execinfo.patch @@ -0,0 +1,40 @@ +--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_xembed_server.c ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c +@@ -35,7 +35,7 @@ + #include <X11/Xlib.h> + #include <X11/Xatom.h> + #include <Xm/MwmUtil.h> +-#ifdef __linux__ ++#if defined(__linux__) && ! defined(__UCLIBC__) + #include <execinfo.h> + #endif + #include <stdio.h> +@@ -835,7 +835,7 @@ + AWT_UNLOCK(); + } + +-#ifdef __linux__ ++#if defined(__linux__) && ! defined(__UCLIBC__) + void + print_stack (void) + { +--- 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(__UCLIBC__) + #include <execinfo.h> + #endif + +@@ -689,7 +689,7 @@ + return ret; + } + +-#ifdef __linux__ ++#if defined(__linux__) && ! defined(__UCLIBC__) + void print_stack(void) + { + void *array[10]; |