summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.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/0007-fix-assembler-flag-handling-in-makefile.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/0007-fix-assembler-flag-handling-in-makefile.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch
index 01cabbd..b7e84b2 100644
--- a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch
@@ -1,7 +1,7 @@
1From b8d48149b05fcd1a12dce25ffc345b43aaa76f32 Mon Sep 17 00:00:00 2001 1From 2206e1d037359cf4f08a6c7b944d6735b56ea36d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> 2From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com>
3Date: Thu, 2 Jan 2020 13:49:02 +0100 3Date: Thu, 2 Jan 2020 13:49:02 +0100
4Subject: [PATCH 07/13] fix assembler flag handling in makefile 4Subject: [PATCH] fix assembler flag handling in makefile
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -14,12 +14,13 @@ Upstream-Status: Pending
14 14
15Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> 15Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
16Signed-off-by: Richard Leitner <richard.leitner@skidata.com> 16Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
17
17--- 18---
18 make/common/NativeCompilation.gmk | 2 +- 19 make/common/NativeCompilation.gmk | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
20 21
21diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk 22diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
22index 92f8033..46a1be9 100644 23index 92f8033f..46a1be91 100644
23--- a/make/common/NativeCompilation.gmk 24--- a/make/common/NativeCompilation.gmk
24+++ b/make/common/NativeCompilation.gmk 25+++ b/make/common/NativeCompilation.gmk
25@@ -391,7 +391,7 @@ define SetupNativeCompilation 26@@ -391,7 +391,7 @@ define SetupNativeCompilation
@@ -31,6 +32,3 @@ index 92f8033..46a1be9 100644
31 32
32 # On windows we need to create a resource file 33 # On windows we need to create a resource file
33 ifeq ($(OPENJDK_TARGET_OS), windows) 34 ifeq ($(OPENJDK_TARGET_OS), windows)
34--
352.26.2
36