diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch')
| -rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch new file mode 100644 index 0000000..c5fa4bf --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch @@ -0,0 +1,30 @@ +From cf40c00dfd6d2299055c0e8415525d2da5e7cd4a Mon Sep 17 00:00:00 2001 +From: Haiqing Bai <Haiqing.Bai@windriver.com> +Date: Thu, 2 Jan 2020 13:45:42 +0100 +Subject: [PATCH 06/10] autoconf: handle extra output + +When adding the environment variable JAVA_TOOL_OPTIONS an extra line +in the output from 'java -version' is produced. As this output is +parsed by configure script the extra line has to be filtered out. + +Signed-off-by: Richard Leitner <richard.leitner@skidata.com> +--- + common/autoconf/boot-jdk.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 +index 5be15b8..0d1a6e1 100644 +--- a/common/autoconf/boot-jdk.m4 ++++ b/common/autoconf/boot-jdk.m4 +@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v JAVA_TOOL_OPTIONS | head -n 1` + + # Extra M4 quote needed to protect [] in grep expression. + [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] +-- +2.24.1 + |