diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2019-12-30 15:35:59 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-01-27 11:02:06 +0100 |
commit | cb6eedeb1f7fa877497e6ff2aa893e8089fe6541 (patch) | |
tree | ba4b6977735e331c5cb6a7585a185fba895f2dc7 /recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch | |
parent | 19b569281cc30e3aa94e772d6885cd340b1d1724 (diff) | |
download | meta-java-cb6eedeb1f7fa877497e6ff2aa893e8089fe6541.tar.gz |
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build"
version the recipes are adapted to use those "ga" versions.
All existing patches got re-applied and renamed. For better handling Hotspot
patches now start at patch number 1001 and jdk patches at 2001.
Furthermore architecture dependent patches are prefixed with the
architecture they apply on.
Following patches/hunks were completely dropped:
- 0002-hotspot-fix-compilation-with-security-flags-enabled.patch
got backported to hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185
- 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch
ostream.cpp:112 got fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502
- 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch
got backported to hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916
- 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd
- 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c
- openjdk8-add-missing-linker-flags.patch
fixed in hotspot jdk8u
https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a
- openjdk8-fix-shark-stdc++11.patch
fixed in hotspot jdk8u
- openjdk8-fix-libpng-neon-build.patch
fixed in jdk
https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1
- aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch
got backported to hotspot jdk8u
Following patches were newly added:
- 0011-autoconf-fix-CC-with-arguments-detection.patch
needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris"
- 0012-autoconf-NativeCompilation-remove-sysroot.patch
needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris"
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch new file mode 100644 index 0000000..c5fa4bf --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From cf40c00dfd6d2299055c0e8415525d2da5e7cd4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | ||
3 | Date: Thu, 2 Jan 2020 13:45:42 +0100 | ||
4 | Subject: [PATCH 06/10] autoconf: handle extra output | ||
5 | |||
6 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line | ||
7 | in the output from 'java -version' is produced. As this output is | ||
8 | parsed by configure script the extra line has to be filtered out. | ||
9 | |||
10 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
11 | --- | ||
12 | common/autoconf/boot-jdk.m4 | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 | ||
16 | index 5be15b8..0d1a6e1 100644 | ||
17 | --- a/common/autoconf/boot-jdk.m4 | ||
18 | +++ b/common/autoconf/boot-jdk.m4 | ||
19 | @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], | ||
20 | BOOT_JDK_FOUND=no | ||
21 | else | ||
22 | # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? | ||
23 | - BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` | ||
24 | + BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep -v JAVA_TOOL_OPTIONS | head -n 1` | ||
25 | |||
26 | # Extra M4 quote needed to protect [] in grep expression. | ||
27 | [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] | ||
28 | -- | ||
29 | 2.24.1 | ||
30 | |||