diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2019-12-30 15:35:59 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-17 13:02:40 +0200 |
commit | 040bfc7748f37b258f8f1d2c6f1d2d44127bf173 (patch) | |
tree | 4a147312e7398d03f0f8bbffd52f71233fa91957 /recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch | |
parent | 4bcf80651fa555611c13c02eaab3529ccf31bbf6 (diff) | |
download | meta-java-040bfc7748f37b258f8f1d2c6f1d2d44127bf173.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"
Additionally add UPDATING.md which describes the openjdk8 update process
for this layer and update8checksums.sh, a script that updates the
openjdk8 source archive checksums in the corresponding .inc files.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch new file mode 100644 index 0000000..f1de194 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 | ||
2 | index e3a82c8..705e3e7 100644 | ||
3 | --- a/common/autoconf/toolchain.m4 | ||
4 | +++ b/common/autoconf/toolchain.m4 | ||
5 | @@ -478,23 +478,30 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], | ||
6 | SEARCH_LIST="$3" | ||
7 | |||
8 | if test "x[$]$1" != x; then | ||
9 | + # split compiler program and arguments | ||
10 | + CBIN=`cut -d ' ' -f1 <<<"[$]$1"` | ||
11 | + CARGS=`cut -d ' ' -f2- <<<"[$]$1"` | ||
12 | + | ||
13 | # User has supplied compiler name already, always let that override. | ||
14 | - AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1]) | ||
15 | - if test "x`basename [$]$1`" = "x[$]$1"; then | ||
16 | + AC_MSG_NOTICE([Will use user supplied compiler ($CBIN) $1=[$]$1]) | ||
17 | + if test "x`basename $CBIN`" = "x$CBIN"; then | ||
18 | # A command without a complete path is provided, search $PATH. | ||
19 | |||
20 | - AC_PATH_PROGS(POTENTIAL_$1, [$]$1) | ||
21 | - if test "x$POTENTIAL_$1" != x; then | ||
22 | - $1=$POTENTIAL_$1 | ||
23 | + AC_PATH_PROGS(POTENTIAL_CBIN, $CBIN) | ||
24 | + if test "x$POTENTIAL_CBIN" != x; then | ||
25 | + CBIN=$POTENTIAL_CBIN | ||
26 | else | ||
27 | - AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found]) | ||
28 | + AC_MSG_ERROR([User supplied compiler $1=$CBIN could not be found]) | ||
29 | fi | ||
30 | else | ||
31 | # Otherwise it might already be a complete path | ||
32 | - if test ! -x "[$]$1"; then | ||
33 | - AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist]) | ||
34 | + if test ! -x "$CBIN"; then | ||
35 | + AC_MSG_ERROR([User supplied compiler $1=$CBIN does not exist]) | ||
36 | fi | ||
37 | fi | ||
38 | + | ||
39 | + $1="$CBIN $CARGS" | ||
40 | + AC_MSG_NOTICE([Mapped user supplied compiler to $1=[$]$1]) | ||
41 | else | ||
42 | # No user supplied value. Locate compiler ourselves. | ||
43 | |||