diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-10-22 09:13:53 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-10-22 13:16:55 +0200 |
commit | e57d6316628670f6b037101bdff8f2e0da7f1605 (patch) | |
tree | c24f804348450561c7d42f5081a6ce4ab177043d /recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch | |
parent | c8892a953a64f354575e66a68742c1b2a138f3a7 (diff) | |
download | meta-java-e57d6316628670f6b037101bdff8f2e0da7f1605.tar.gz |
openjdk-8: update to latest ga version 272
For aarch32 we need to fall back to b09 as there is no ga tag available
yet.
Patch related changes:
* 0011, 0012 & 0013 were changed to valid git patches
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Cherry-picked-from: 03537feee539526ec9bb0cf4f55dd4eef6badc71
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 | 62 |
1 files changed, 36 insertions, 26 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 4610c73..d3bd8e7 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,18 +1,24 @@ | |||
1 | # HG changeset patch | 1 | From 3d7493808f435b70101003534d98e249bf7e734c Mon Sep 17 00:00:00 2001 |
2 | # User Richard Leitner <richard.leitner@skidata.com> | 2 | From: Richard Leitner <richard.leitner@skidata.com> |
3 | # Date 1588148111 -7200 | 3 | Date: Wed, 29 Apr 2020 10:15:11 +0200 |
4 | # Wed Apr 29 10:15:11 2020 +0200 | 4 | Subject: [PATCH 13/13] autoconf: remove Werror |
5 | # Node ID e063bb17c5fb8edfbad1bfb5237b69350645ed0b | ||
6 | # Parent 041cb274be1207a991e05b041f57a800e8132cff | ||
7 | autoconf: remove Werror | ||
8 | 5 | ||
9 | 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 |
10 | compiler versions therefore we remove Werror. | 7 | compiler versions therefore we remove Werror. |
11 | 8 | ||
12 | diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 | 9 | Upstream-Status: Invalid |
13 | --- a/common/autoconf/flags.m4 Fri Apr 24 04:22:43 2020 +0100 | 10 | |
14 | +++ b/common/autoconf/flags.m4 Wed Apr 29 10:15:11 2020 +0200 | 11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
15 | @@ -399,7 +399,7 @@ | 12 | --- |
13 | common/autoconf/flags.m4 | 12 +++--- | ||
14 | common/autoconf/generated-configure.sh | 56 +++++++++++++------------- | ||
15 | 2 files changed, 34 insertions(+), 34 deletions(-) | ||
16 | |||
17 | diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 | ||
18 | index 077efa2..b98575a 100644 | ||
19 | --- a/common/autoconf/flags.m4 | ||
20 | +++ b/common/autoconf/flags.m4 | ||
21 | @@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], | ||
16 | LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" | 22 | LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" |
17 | fi | 23 | fi |
18 | $2CXXSTD_CXXFLAG="-std=gnu++98" | 24 | $2CXXSTD_CXXFLAG="-std=gnu++98" |
@@ -21,7 +27,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 | |||
21 | [], [$2CXXSTD_CXXFLAG=""]) | 27 | [], [$2CXXSTD_CXXFLAG=""]) |
22 | $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" | 28 | $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" |
23 | $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}" | 29 | $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}" |
24 | @@ -489,17 +489,17 @@ | 30 | @@ -489,17 +489,17 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], |
25 | # Notably, -ffp-contract=off needs to be added for GCC >= 4.6, | 31 | # Notably, -ffp-contract=off needs to be added for GCC >= 4.6, |
26 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 | 32 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 |
27 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" | 33 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" |
@@ -42,7 +48,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 | |||
42 | [], [NO_STRICT_ALIASING_FLAG=""]) | 48 | [], [NO_STRICT_ALIASING_FLAG=""]) |
43 | if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test "x$NO_STRICT_ALIASING_FLAG" != "x"; then | 49 | if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test "x$NO_STRICT_ALIASING_FLAG" != "x"; then |
44 | FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG" | 50 | FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG" |
45 | @@ -866,11 +866,11 @@ | 51 | @@ -866,11 +866,11 @@ AC_DEFUN_ONCE([FLAGS_SETUP_GCC6_COMPILER_FLAGS], |
46 | # Notably, value range propagation now assumes that the this pointer of C++ | 52 | # Notably, value range propagation now assumes that the this pointer of C++ |
47 | # member functions is non-null. | 53 | # member functions is non-null. |
48 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" | 54 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" |
@@ -56,10 +62,11 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/flags.m4 | |||
56 | [], [NO_LIFETIME_DSE_CFLAG=""]) | 62 | [], [NO_LIFETIME_DSE_CFLAG=""]) |
57 | CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" | 63 | CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" |
58 | AC_SUBST([NO_LIFETIME_DSE_CFLAG]) | 64 | AC_SUBST([NO_LIFETIME_DSE_CFLAG]) |
59 | diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | 65 | diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh |
60 | --- a/common/autoconf/generated-configure.sh Fri Apr 24 04:22:43 2020 +0100 | 66 | index d57035b..1953dc4 100644 |
61 | +++ b/common/autoconf/generated-configure.sh Wed Apr 29 10:15:11 2020 +0200 | 67 | --- a/common/autoconf/generated-configure.sh |
62 | @@ -41490,12 +41490,12 @@ | 68 | +++ b/common/autoconf/generated-configure.sh |
69 | @@ -41498,12 +41498,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } | ||
63 | fi | 70 | fi |
64 | CXXSTD_CXXFLAG="-std=gnu++98" | 71 | CXXSTD_CXXFLAG="-std=gnu++98" |
65 | 72 | ||
@@ -75,7 +82,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
75 | ac_ext=cpp | 82 | ac_ext=cpp |
76 | ac_cpp='$CXXCPP $CPPFLAGS' | 83 | ac_cpp='$CXXCPP $CPPFLAGS' |
77 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 84 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
78 | @@ -41646,12 +41646,12 @@ | 85 | @@ -41654,12 +41654,12 @@ fi |
79 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" | 86 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" |
80 | 87 | ||
81 | 88 | ||
@@ -91,7 +98,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
91 | ac_ext=c | 98 | ac_ext=c |
92 | ac_cpp='$CPP $CPPFLAGS' | 99 | ac_cpp='$CPP $CPPFLAGS' |
93 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 100 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
94 | @@ -41686,12 +41686,12 @@ | 101 | @@ -41694,12 +41694,12 @@ $as_echo "$supports" >&6; } |
95 | fi | 102 | fi |
96 | 103 | ||
97 | 104 | ||
@@ -107,7 +114,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
107 | ac_ext=cpp | 114 | ac_ext=cpp |
108 | ac_cpp='$CXXCPP $CPPFLAGS' | 115 | ac_cpp='$CXXCPP $CPPFLAGS' |
109 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 116 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
110 | @@ -41725,8 +41725,8 @@ | 117 | @@ -41733,8 +41733,8 @@ $as_echo "$supports" >&6; } |
111 | fi | 118 | fi |
112 | 119 | ||
113 | 120 | ||
@@ -118,7 +125,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
118 | supports=no | 125 | supports=no |
119 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi | 126 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi |
120 | 127 | ||
121 | @@ -41742,12 +41742,12 @@ | 128 | @@ -41750,12 +41750,12 @@ $as_echo "$supports" >&6; } |
122 | NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" | 129 | NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" |
123 | 130 | ||
124 | 131 | ||
@@ -134,7 +141,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
134 | ac_ext=c | 141 | ac_ext=c |
135 | ac_cpp='$CPP $CPPFLAGS' | 142 | ac_cpp='$CPP $CPPFLAGS' |
136 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 143 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
137 | @@ -41781,12 +41781,12 @@ | 144 | @@ -41789,12 +41789,12 @@ $as_echo "$supports" >&6; } |
138 | fi | 145 | fi |
139 | 146 | ||
140 | 147 | ||
@@ -150,7 +157,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
150 | ac_ext=cpp | 157 | ac_ext=cpp |
151 | ac_cpp='$CXXCPP $CPPFLAGS' | 158 | ac_cpp='$CXXCPP $CPPFLAGS' |
152 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 159 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
153 | @@ -41820,8 +41820,8 @@ | 160 | @@ -41828,8 +41828,8 @@ $as_echo "$supports" >&6; } |
154 | fi | 161 | fi |
155 | 162 | ||
156 | 163 | ||
@@ -161,7 +168,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
161 | supports=no | 168 | supports=no |
162 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi | 169 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi |
163 | 170 | ||
164 | @@ -41854,12 +41854,12 @@ | 171 | @@ -41862,12 +41862,12 @@ $as_echo "$supports" >&6; } |
165 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 | 172 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 |
166 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" | 173 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" |
167 | 174 | ||
@@ -177,7 +184,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
177 | ac_ext=cpp | 184 | ac_ext=cpp |
178 | ac_cpp='$CXXCPP $CPPFLAGS' | 185 | ac_cpp='$CXXCPP $CPPFLAGS' |
179 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 186 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
180 | @@ -41898,12 +41898,12 @@ | 187 | @@ -41906,12 +41906,12 @@ $as_echo "$supports" >&6; } |
181 | test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then | 188 | test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then |
182 | M_NO_FUSED_ADD_FLAG="-mno-fused-madd" | 189 | M_NO_FUSED_ADD_FLAG="-mno-fused-madd" |
183 | 190 | ||
@@ -193,7 +200,7 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
193 | ac_ext=cpp | 200 | ac_ext=cpp |
194 | ac_cpp='$CXXCPP $CPPFLAGS' | 201 | ac_cpp='$CXXCPP $CPPFLAGS' |
195 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 202 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
196 | @@ -41938,12 +41938,12 @@ | 203 | @@ -41946,12 +41946,12 @@ $as_echo "$supports" >&6; } |
197 | 204 | ||
198 | NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" | 205 | NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" |
199 | 206 | ||
@@ -209,3 +216,6 @@ diff -r 041cb274be12 -r e063bb17c5fb common/autoconf/generated-configure.sh | |||
209 | ac_ext=cpp | 216 | ac_ext=cpp |
210 | ac_cpp='$CXXCPP $CPPFLAGS' | 217 | ac_cpp='$CXXCPP $CPPFLAGS' |
211 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 218 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
219 | -- | ||
220 | 2.26.2 | ||
221 | |||