aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch
diff options
context:
space:
mode:
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.patch10
1 files changed, 4 insertions, 6 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
index 58dd7bc..d24ed71 100644
--- 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
@@ -1,19 +1,20 @@
-From ee5e07895570a9ea2ae2490f3b159bde29967238 Mon Sep 17 00:00:00 2001
+From be1397b2106874869eebfc0b21943f1976a97f1b 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/13] autoconf: handle extra output
+Subject: [PATCH] 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
+index 5be15b86..0d1a6e14 100644
--- a/common/autoconf/boot-jdk.m4
+++ b/common/autoconf/boot-jdk.m4
@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
@@ -25,6 +26,3 @@ index 5be15b8..0d1a6e1 100644
# Extra M4 quote needed to protect [] in grep expression.
[FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`]
---
-2.26.2
-