summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch
diff options
context:
space:
mode:
authorGeoff Parker <geoffrey.parker@arthrex.com>2023-05-01 19:26:20 -0700
committerRichard <g0hl1n@users.noreply.github.com>2023-05-02 09:02:27 +0200
commitbf6ae1dac46dc9894f206c7f81570548dbf6785c (patch)
tree6cffa5a73f21963c52034d5dc5f66f8d935e3d96 /recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch
parente122acf3e9570ceb055e55feb41e5558463253e4 (diff)
downloadmeta-java-bf6ae1dac46dc9894f206c7f81570548dbf6785c.tar.gz
openjdk-8: Update patches for patch fuzz for Yocto 4.2 mickledore
Yocto 4.2 bitbake is more pedantic on patch fuzz, which treats patch fuzz Warnings as Errors, and fails the bulid. Corrected patch fuzz with: devtool modify openjdk-8-native devtool finish --force-patch-refresh openjdk-8-native <meta-java layer_path> but removed the changes to 1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch which rewrote a huge amount of source files in their entirety for some reason. Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com>
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 @@
1From ee5e07895570a9ea2ae2490f3b159bde29967238 Mon Sep 17 00:00:00 2001 1From be1397b2106874869eebfc0b21943f1976a97f1b Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com> 2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Thu, 2 Jan 2020 13:45:42 +0100 3Date: Thu, 2 Jan 2020 13:45:42 +0100
4Subject: [PATCH 06/13] autoconf: handle extra output 4Subject: [PATCH] autoconf: handle extra output
5 5
6When adding the environment variable JAVA_TOOL_OPTIONS an extra line 6When adding the environment variable JAVA_TOOL_OPTIONS an extra line
7in the output from 'java -version' is produced. As this output is 7in the output from 'java -version' is produced. As this output is
8parsed by configure script the extra line has to be filtered out. 8parsed by configure script the extra line has to be filtered out.
9 9
10Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 10Signed-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
15diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 16diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4
16index 5be15b8..0d1a6e1 100644 17index 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--
292.26.2
30