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 | 10 |
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 @@ | |||
1 | From ee5e07895570a9ea2ae2490f3b159bde29967238 Mon Sep 17 00:00:00 2001 | 1 | From be1397b2106874869eebfc0b21943f1976a97f1b Mon Sep 17 00:00:00 2001 |
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | 2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> |
3 | Date: Thu, 2 Jan 2020 13:45:42 +0100 | 3 | Date: Thu, 2 Jan 2020 13:45:42 +0100 |
4 | Subject: [PATCH 06/13] autoconf: handle extra output | 4 | Subject: [PATCH] autoconf: handle extra output |
5 | 5 | ||
6 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line | 6 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line |
7 | in the output from 'java -version' is produced. As this output is | 7 | in the output from 'java -version' is produced. As this output is |
8 | parsed by configure script the extra line has to be filtered out. | 8 | parsed by configure script the extra line has to be filtered out. |
9 | 9 | ||
10 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 10 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
11 | |||
11 | --- | 12 | --- |
12 | common/autoconf/boot-jdk.m4 | 2 +- | 13 | common/autoconf/boot-jdk.m4 | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 | 16 | diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 |
16 | index 5be15b8..0d1a6e1 100644 | 17 | index 5be15b86..0d1a6e14 100644 |
17 | --- a/common/autoconf/boot-jdk.m4 | 18 | --- a/common/autoconf/boot-jdk.m4 |
18 | +++ b/common/autoconf/boot-jdk.m4 | 19 | +++ b/common/autoconf/boot-jdk.m4 |
19 | @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], | 20 | @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], |
@@ -25,6 +26,3 @@ index 5be15b8..0d1a6e1 100644 | |||
25 | 26 | ||
26 | # Extra M4 quote needed to protect [] in grep expression. | 27 | # Extra M4 quote needed to protect [] in grep expression. |
27 | [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] | 28 | [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] |
28 | -- | ||
29 | 2.26.2 | ||
30 | |||