From bf6ae1dac46dc9894f206c7f81570548dbf6785c Mon Sep 17 00:00:00 2001 From: Geoff Parker Date: Mon, 1 May 2023 19:26:20 -0700 Subject: 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 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 --- .../0013-autoconf-remove-Werror.patch | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch') 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 @@ -From 3d7493808f435b70101003534d98e249bf7e734c Mon Sep 17 00:00:00 2001 +From 3a41aceff84ac9c64910f2efbd4bee7c3532c65d Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Wed, 29 Apr 2020 10:15:11 +0200 -Subject: [PATCH 13/13] autoconf: remove Werror +Subject: [PATCH] autoconf: remove Werror We don't want to mess around with disabling warnings on new compiler versions therefore we remove Werror. @@ -9,13 +9,14 @@ compiler versions therefore we remove Werror. Upstream-Status: Invalid Signed-off-by: Richard Leitner + --- common/autoconf/flags.m4 | 12 +++--- common/autoconf/generated-configure.sh | 56 +++++++++++++------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 -index 077efa2..b98575a 100644 +index 077efa29..b98575a1 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], @@ -63,10 +64,10 @@ index 077efa2..b98575a 100644 CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" AC_SUBST([NO_LIFETIME_DSE_CFLAG]) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh -index f285a74..31d41b1 100644 +index d57035b0..1953dc4e 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh -@@ -41503,12 +41503,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -41498,12 +41498,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } fi CXXSTD_CXXFLAG="-std=gnu++98" @@ -82,7 +83,7 @@ index f285a74..31d41b1 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41659,12 +41659,12 @@ fi +@@ -41654,12 +41654,12 @@ fi NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" @@ -98,7 +99,7 @@ index f285a74..31d41b1 100644 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41699,12 +41699,12 @@ $as_echo "$supports" >&6; } +@@ -41694,12 +41694,12 @@ $as_echo "$supports" >&6; } fi @@ -114,7 +115,7 @@ index f285a74..31d41b1 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41738,8 +41738,8 @@ $as_echo "$supports" >&6; } +@@ -41733,8 +41733,8 @@ $as_echo "$supports" >&6; } fi @@ -125,7 +126,7 @@ index f285a74..31d41b1 100644 supports=no if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi -@@ -41755,12 +41755,12 @@ $as_echo "$supports" >&6; } +@@ -41750,12 +41750,12 @@ $as_echo "$supports" >&6; } NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" @@ -141,7 +142,7 @@ index f285a74..31d41b1 100644 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41794,12 +41794,12 @@ $as_echo "$supports" >&6; } +@@ -41789,12 +41789,12 @@ $as_echo "$supports" >&6; } fi @@ -157,7 +158,7 @@ index f285a74..31d41b1 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41833,8 +41833,8 @@ $as_echo "$supports" >&6; } +@@ -41828,8 +41828,8 @@ $as_echo "$supports" >&6; } fi @@ -168,7 +169,7 @@ index f285a74..31d41b1 100644 supports=no if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi -@@ -41867,12 +41867,12 @@ $as_echo "$supports" >&6; } +@@ -41862,12 +41862,12 @@ $as_echo "$supports" >&6; } # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" @@ -184,7 +185,7 @@ index f285a74..31d41b1 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41911,12 +41911,12 @@ $as_echo "$supports" >&6; } +@@ -41906,12 +41906,12 @@ $as_echo "$supports" >&6; } test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then M_NO_FUSED_ADD_FLAG="-mno-fused-madd" @@ -200,7 +201,7 @@ index f285a74..31d41b1 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41951,12 +41951,12 @@ $as_echo "$supports" >&6; } +@@ -41946,12 +41946,12 @@ $as_echo "$supports" >&6; } NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" @@ -216,6 +217,3 @@ index f285a74..31d41b1 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --- -2.26.2 - -- cgit v1.2.3-54-g00ecf