summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc4
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc10
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch17
3 files changed, 31 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index 7d625eb..d4cf7ac 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -170,6 +170,10 @@ EXTRA_OEMAKE = ' \
170 ' 170 '
171 171
172do_compile() { 172do_compile() {
173 # Use JAVA_TOOL_OPTIONS from environment. On some machines this is needed
174 # in order to start java when the amount of RAM is limited for the user.
175 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
176
173 # OpenJDK uses slightly different names for certain arches. We need to know 177 # OpenJDK uses slightly different names for certain arches. We need to know
174 # this to create some files which are expected by the build. 178 # this to create some files which are expected by the build.
175 case "${TRANSLATED_TARGET_ARCH}" in 179 case "${TRANSLATED_TARGET_ARCH}" in
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index fd97eff..20e1743 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -9,6 +9,8 @@ DEPENDS = "\
9 ca-certificates-native openssl-native coreutils-native \ 9 ca-certificates-native openssl-native coreutils-native \
10" 10"
11 11
12SRC_URI_append += "file://handle_extra_output.patch"
13
12PACKAGECONFIG ??= "" 14PACKAGECONFIG ??= ""
13PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" 15PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native"
14PACKAGECONFIG[cups] = "--with-cups,,cups" 16PACKAGECONFIG[cups] = "--with-cups,,cups"
@@ -47,6 +49,14 @@ EXTRA_OEMAKE_append = ' \
47 images \ 49 images \
48' 50'
49 51
52do_configure_prepend() {
53 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
54}
55
56do_compile_prepend() {
57 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
58}
59
50do_compile_append() { 60do_compile_append() {
51 set -x 61 set -x
52 mkdir -p ${B}/certs 62 mkdir -p ${B}/certs
diff --git a/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch b/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch
new file mode 100644
index 0000000..52aad95
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch
@@ -0,0 +1,17 @@
1When adding the environment variable JAVA_TOOL_OPTIONS an extra line
2in the output from 'java -version' is produced. As this output is
3parsed by configure script the extra line has to be filtered out.
4
5Index: jdk8u-e8bed1496ff2/common/autoconf/boot-jdk.m4
6===================================================================
7--- jdk8u-e8bed1496ff2.orig/common/autoconf/boot-jdk.m4
8+++ jdk8u-e8bed1496ff2/common/autoconf/boot-jdk.m4
9@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
10 BOOT_JDK_FOUND=no
11 else
12 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
13- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
14+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v JAVA_TOOL_OPTIONS | head -n 1`
15
16 # Extra M4 quote needed to protect [] in grep expression.
17 [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`]