diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2012-04-03 17:05:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2012-04-03 17:05:25 +0200 |
| commit | b9cc51c4c2c315f508459cea7da1d8433333d7a1 (patch) | |
| tree | 8c621f3331662c6c21d07c48d17dfb1e86722e02 /jtools | |
| parent | 6a71d6abfeda9e27a904dae851201d9d0b454978 (diff) | |
lemote addons, like pdf viewer
Diffstat (limited to 'jtools')
| -rw-r--r-- | jtools/openjdk/Makefile | 2 | ||||
| -rw-r--r-- | jtools/openjdk/patches/disable-backtrace.patch | 24 | ||||
| -rw-r--r-- | jtools/openjdk/patches/linux3.patch | 11 |
3 files changed, 37 insertions, 0 deletions
diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile index 600db055b..32e0eac0e 100644 --- a/jtools/openjdk/Makefile +++ b/jtools/openjdk/Makefile @@ -62,6 +62,8 @@ $(WRKDIST)/.extract: $(WRKDIST)/.extract_done cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/linux3.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/disable-backtrace.patch touch $@ $(WRKDIST)/.configured: ${WRKDIST}/.extract diff --git a/jtools/openjdk/patches/disable-backtrace.patch b/jtools/openjdk/patches/disable-backtrace.patch new file mode 100644 index 000000000..393ee9251 --- /dev/null +++ b/jtools/openjdk/patches/disable-backtrace.patch @@ -0,0 +1,24 @@ + + uClibc does not have backtrace support right now. Disable it for now. + +--- openjdk-6.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-02-28 17:06:50.000000000 +0100 ++++ openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c 2011-08-08 10:45:01.445330729 +0200 +@@ -27,9 +27,6 @@ + #include <X11/Xutil.h> + #include <X11/Xos.h> + #include <X11/Xatom.h> +-#ifdef __linux__ +-#include <execinfo.h> +-#endif + + #include <jvm.h> + #include <jni.h> +@@ -689,7 +686,7 @@ + return ret; + } + +-#ifdef __linux__ ++#if 0 + void print_stack(void) + { + void *array[10]; diff --git a/jtools/openjdk/patches/linux3.patch b/jtools/openjdk/patches/linux3.patch new file mode 100644 index 000000000..bf6ccaa28 --- /dev/null +++ b/jtools/openjdk/patches/linux3.patch @@ -0,0 +1,11 @@ +--- openjdk-6.orig/hotspot/make/linux/Makefile 2011-02-28 17:03:13.000000000 +0100 ++++ openjdk-6/hotspot/make/linux/Makefile 2012-03-27 22:44:07.897199377 +0200 +@@ -230,7 +230,7 @@ + # Solaris 2.5.1, 2.6). + # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. + +-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% ++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3.0% 3.1% 3.2% 3.3% + OS_VERSION := $(shell uname -r) + EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) + |