diff options
author | Geoff Parker <geoffrey.parker@arthrex.com> | 2023-05-01 19:26:20 -0700 |
---|---|---|
committer | Richard <g0hl1n@users.noreply.github.com> | 2023-05-02 09:02:27 +0200 |
commit | bf6ae1dac46dc9894f206c7f81570548dbf6785c (patch) | |
tree | 6cffa5a73f21963c52034d5dc5f66f8d935e3d96 /recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch | |
parent | e122acf3e9570ceb055e55feb41e5558463253e4 (diff) | |
download | meta-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/0003-build-fix-build-on-as-needed-toolchains-generic.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch index d2b6031..0ab4b7d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 770123c9fcc4ab8c8ce8f37cde5afe9c44c7176c Mon Sep 17 00:00:00 2001 | 1 | From 34bfdbabf0b2d9b1d0965b5fe362fd9596f58527 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 | 3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 |
4 | Subject: [PATCH 03/13] build: fix build on --as-needed toolchains (generic) | 4 | Subject: [PATCH] build: fix build on --as-needed toolchains (generic) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -66,12 +66,13 @@ all. | |||
66 | 66 | ||
67 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 67 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
68 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 68 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
69 | |||
69 | --- | 70 | --- |
70 | make/common/NativeCompilation.gmk | 5 ++--- | 71 | make/common/NativeCompilation.gmk | 5 ++--- |
71 | 1 file changed, 2 insertions(+), 3 deletions(-) | 72 | 1 file changed, 2 insertions(+), 3 deletions(-) |
72 | 73 | ||
73 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | 74 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk |
74 | index d961cf3..92f8033 100644 | 75 | index d961cf35..92f8033f 100644 |
75 | --- a/make/common/NativeCompilation.gmk | 76 | --- a/make/common/NativeCompilation.gmk |
76 | +++ b/make/common/NativeCompilation.gmk | 77 | +++ b/make/common/NativeCompilation.gmk |
77 | @@ -618,9 +618,8 @@ endif # no MacOS X support yet | 78 | @@ -618,9 +618,8 @@ endif # no MacOS X support yet |
@@ -86,6 +87,3 @@ index d961cf3..92f8033 100644 | |||
86 | ifneq (,$$($1_GEN_MANIFEST)) | 87 | ifneq (,$$($1_GEN_MANIFEST)) |
87 | $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 | 88 | $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 |
88 | endif | 89 | endif |
89 | -- | ||
90 | 2.26.2 | ||
91 | |||