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/0013-autoconf-remove-Werror.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/0013-autoconf-remove-Werror.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch index 91fedb5..7991a04 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3d7493808f435b70101003534d98e249bf7e734c Mon Sep 17 00:00:00 2001 | 1 | From 3a41aceff84ac9c64910f2efbd4bee7c3532c65d Mon Sep 17 00:00:00 2001 |
2 | From: Richard Leitner <richard.leitner@skidata.com> | 2 | From: Richard Leitner <richard.leitner@skidata.com> |
3 | Date: Wed, 29 Apr 2020 10:15:11 +0200 | 3 | Date: Wed, 29 Apr 2020 10:15:11 +0200 |
4 | Subject: [PATCH 13/13] autoconf: remove Werror | 4 | Subject: [PATCH] autoconf: remove Werror |
5 | 5 | ||
6 | We don't want to mess around with disabling warnings on new | 6 | We don't want to mess around with disabling warnings on new |
7 | compiler versions therefore we remove Werror. | 7 | compiler versions therefore we remove Werror. |
@@ -9,13 +9,14 @@ compiler versions therefore we remove Werror. | |||
9 | Upstream-Status: Invalid | 9 | Upstream-Status: Invalid |
10 | 10 | ||
11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
12 | |||
12 | --- | 13 | --- |
13 | common/autoconf/flags.m4 | 12 +++--- | 14 | common/autoconf/flags.m4 | 12 +++--- |
14 | common/autoconf/generated-configure.sh | 56 +++++++++++++------------- | 15 | common/autoconf/generated-configure.sh | 56 +++++++++++++------------- |
15 | 2 files changed, 34 insertions(+), 34 deletions(-) | 16 | 2 files changed, 34 insertions(+), 34 deletions(-) |
16 | 17 | ||
17 | diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 | 18 | diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 |
18 | index 077efa2..b98575a 100644 | 19 | index 077efa29..b98575a1 100644 |
19 | --- a/common/autoconf/flags.m4 | 20 | --- a/common/autoconf/flags.m4 |
20 | +++ b/common/autoconf/flags.m4 | 21 | +++ b/common/autoconf/flags.m4 |
21 | @@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], | 22 | @@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], |
@@ -63,10 +64,10 @@ index 077efa2..b98575a 100644 | |||
63 | CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" | 64 | CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" |
64 | AC_SUBST([NO_LIFETIME_DSE_CFLAG]) | 65 | AC_SUBST([NO_LIFETIME_DSE_CFLAG]) |
65 | diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh | 66 | diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh |
66 | index f285a74..31d41b1 100644 | 67 | index d57035b0..1953dc4e 100644 |
67 | --- a/common/autoconf/generated-configure.sh | 68 | --- a/common/autoconf/generated-configure.sh |
68 | +++ b/common/autoconf/generated-configure.sh | 69 | +++ b/common/autoconf/generated-configure.sh |
69 | @@ -41503,12 +41503,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } | 70 | @@ -41498,12 +41498,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } |
70 | fi | 71 | fi |
71 | CXXSTD_CXXFLAG="-std=gnu++98" | 72 | CXXSTD_CXXFLAG="-std=gnu++98" |
72 | 73 | ||
@@ -82,7 +83,7 @@ index f285a74..31d41b1 100644 | |||
82 | ac_ext=cpp | 83 | ac_ext=cpp |
83 | ac_cpp='$CXXCPP $CPPFLAGS' | 84 | ac_cpp='$CXXCPP $CPPFLAGS' |
84 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 85 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
85 | @@ -41659,12 +41659,12 @@ fi | 86 | @@ -41654,12 +41654,12 @@ fi |
86 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" | 87 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" |
87 | 88 | ||
88 | 89 | ||
@@ -98,7 +99,7 @@ index f285a74..31d41b1 100644 | |||
98 | ac_ext=c | 99 | ac_ext=c |
99 | ac_cpp='$CPP $CPPFLAGS' | 100 | ac_cpp='$CPP $CPPFLAGS' |
100 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 101 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
101 | @@ -41699,12 +41699,12 @@ $as_echo "$supports" >&6; } | 102 | @@ -41694,12 +41694,12 @@ $as_echo "$supports" >&6; } |
102 | fi | 103 | fi |
103 | 104 | ||
104 | 105 | ||
@@ -114,7 +115,7 @@ index f285a74..31d41b1 100644 | |||
114 | ac_ext=cpp | 115 | ac_ext=cpp |
115 | ac_cpp='$CXXCPP $CPPFLAGS' | 116 | ac_cpp='$CXXCPP $CPPFLAGS' |
116 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 117 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
117 | @@ -41738,8 +41738,8 @@ $as_echo "$supports" >&6; } | 118 | @@ -41733,8 +41733,8 @@ $as_echo "$supports" >&6; } |
118 | fi | 119 | fi |
119 | 120 | ||
120 | 121 | ||
@@ -125,7 +126,7 @@ index f285a74..31d41b1 100644 | |||
125 | supports=no | 126 | supports=no |
126 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi | 127 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi |
127 | 128 | ||
128 | @@ -41755,12 +41755,12 @@ $as_echo "$supports" >&6; } | 129 | @@ -41750,12 +41750,12 @@ $as_echo "$supports" >&6; } |
129 | NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" | 130 | NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" |
130 | 131 | ||
131 | 132 | ||
@@ -141,7 +142,7 @@ index f285a74..31d41b1 100644 | |||
141 | ac_ext=c | 142 | ac_ext=c |
142 | ac_cpp='$CPP $CPPFLAGS' | 143 | ac_cpp='$CPP $CPPFLAGS' |
143 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 144 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
144 | @@ -41794,12 +41794,12 @@ $as_echo "$supports" >&6; } | 145 | @@ -41789,12 +41789,12 @@ $as_echo "$supports" >&6; } |
145 | fi | 146 | fi |
146 | 147 | ||
147 | 148 | ||
@@ -157,7 +158,7 @@ index f285a74..31d41b1 100644 | |||
157 | ac_ext=cpp | 158 | ac_ext=cpp |
158 | ac_cpp='$CXXCPP $CPPFLAGS' | 159 | ac_cpp='$CXXCPP $CPPFLAGS' |
159 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 160 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
160 | @@ -41833,8 +41833,8 @@ $as_echo "$supports" >&6; } | 161 | @@ -41828,8 +41828,8 @@ $as_echo "$supports" >&6; } |
161 | fi | 162 | fi |
162 | 163 | ||
163 | 164 | ||
@@ -168,7 +169,7 @@ index f285a74..31d41b1 100644 | |||
168 | supports=no | 169 | supports=no |
169 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi | 170 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi |
170 | 171 | ||
171 | @@ -41867,12 +41867,12 @@ $as_echo "$supports" >&6; } | 172 | @@ -41862,12 +41862,12 @@ $as_echo "$supports" >&6; } |
172 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 | 173 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 |
173 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" | 174 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" |
174 | 175 | ||
@@ -184,7 +185,7 @@ index f285a74..31d41b1 100644 | |||
184 | ac_ext=cpp | 185 | ac_ext=cpp |
185 | ac_cpp='$CXXCPP $CPPFLAGS' | 186 | ac_cpp='$CXXCPP $CPPFLAGS' |
186 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 187 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
187 | @@ -41911,12 +41911,12 @@ $as_echo "$supports" >&6; } | 188 | @@ -41906,12 +41906,12 @@ $as_echo "$supports" >&6; } |
188 | test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then | 189 | test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then |
189 | M_NO_FUSED_ADD_FLAG="-mno-fused-madd" | 190 | M_NO_FUSED_ADD_FLAG="-mno-fused-madd" |
190 | 191 | ||
@@ -200,7 +201,7 @@ index f285a74..31d41b1 100644 | |||
200 | ac_ext=cpp | 201 | ac_ext=cpp |
201 | ac_cpp='$CXXCPP $CPPFLAGS' | 202 | ac_cpp='$CXXCPP $CPPFLAGS' |
202 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 203 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
203 | @@ -41951,12 +41951,12 @@ $as_echo "$supports" >&6; } | 204 | @@ -41946,12 +41946,12 @@ $as_echo "$supports" >&6; } |
204 | 205 | ||
205 | NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" | 206 | NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" |
206 | 207 | ||
@@ -216,6 +217,3 @@ index f285a74..31d41b1 100644 | |||
216 | ac_ext=cpp | 217 | ac_ext=cpp |
217 | ac_cpp='$CXXCPP $CPPFLAGS' | 218 | ac_cpp='$CXXCPP $CPPFLAGS' |
218 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 219 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
219 | -- | ||
220 | 2.26.2 | ||
221 | |||