diff options
author | Haiqing Bai <Haiqing.Bai@windriver.com> | 2017-11-02 16:33:12 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-12-22 10:28:27 -0200 |
commit | b2e309882732f3566f0459b0654b99b3e9bf9d25 (patch) | |
tree | c8dda7f61d9a80f2fcdb685bf4e4c446f1629a4d /recipes-core/openjdk | |
parent | 03e35bf64f97980652ac532cca0ea96e730a551c (diff) | |
download | meta-java-b2e309882732f3566f0459b0654b99b3e9bf9d25.tar.gz |
openjdk-8-native, icedtea7-native: use JAVA_TOOL_OPTIONS from environment
Solution on how to be able to build openjdk for a build
host that need the environment variable JAVA_TOOL_OPTIONS.
Use JAVA_TOOL_OPTIONS from environment. On some machines this is needed
in order to start java when the amount of RAM is limited for the user.
Author: Peter Bergin <peter.bergin@windriver.com>
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-native.inc | 10 | ||||
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch | 17 |
2 files changed, 27 insertions, 0 deletions
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 | ||
12 | SRC_URI_append += "file://handle_extra_output.patch" | ||
13 | |||
12 | PACKAGECONFIG ??= "" | 14 | PACKAGECONFIG ??= "" |
13 | PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" | 15 | PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" |
14 | PACKAGECONFIG[cups] = "--with-cups,,cups" | 16 | PACKAGECONFIG[cups] = "--with-cups,,cups" |
@@ -47,6 +49,14 @@ EXTRA_OEMAKE_append = ' \ | |||
47 | images \ | 49 | images \ |
48 | ' | 50 | ' |
49 | 51 | ||
52 | do_configure_prepend() { | ||
53 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | ||
54 | } | ||
55 | |||
56 | do_compile_prepend() { | ||
57 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | ||
58 | } | ||
59 | |||
50 | do_compile_append() { | 60 | do_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 @@ | |||
1 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line | ||
2 | in the output from 'java -version' is produced. As this output is | ||
3 | parsed by configure script the extra line has to be filtered out. | ||
4 | |||
5 | Index: 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]\.'`] | ||