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/0002-Allow-using-a-system-installed-libpng.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/0002-Allow-using-a-system-installed-libpng.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch new file mode 100644 index 0000000..ed8ecfa --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch | |||
@@ -0,0 +1,80 @@ | |||
1 | From ed79dc49323cc08e81b3699817825f66b1af0ce2 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Thu, 2 Jan 2020 13:40:50 +0100 | ||
4 | Subject: [PATCH 02/10] Allow using a system-installed libpng | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Patch stolen (and some typos corrected) from debian patch, | ||
10 | which itself was a backport from: | ||
11 | http://hg.openjdk.java.net/jdk9/jdk9/rev/bfc1c131e540 | ||
12 | http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5e503831b142 | ||
13 | |||
14 | Issues fixed on top of debian patch: | ||
15 | * the default when --with-libpng= is not given works | ||
16 | * using the bundled libpng works | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
22 | --- | ||
23 | common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++ | ||
24 | 1 file changed, 41 insertions(+) | ||
25 | |||
26 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
27 | index d2732eb..727f018 100644 | ||
28 | --- a/common/autoconf/libraries.m4 | ||
29 | +++ b/common/autoconf/libraries.m4 | ||
30 | @@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | ||
31 | fi | ||
32 | AC_SUBST(USE_EXTERNAL_LIBGIF) | ||
33 | |||
34 | + ############################################################################### | ||
35 | + # | ||
36 | + # Check for the png library | ||
37 | + # | ||
38 | + | ||
39 | + AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng], | ||
40 | + [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])]) | ||
41 | + | ||
42 | + AC_CHECK_LIB(png, png_sig_cmp, | ||
43 | + [ LIBPNG_FOUND=yes ], | ||
44 | + [ LIBPNG_FOUND=no ]) | ||
45 | + | ||
46 | + AC_MSG_CHECKING([for which libpng to use]) | ||
47 | + | ||
48 | + # default is bundled | ||
49 | + DEFAULT_LIBPNG=bundled | ||
50 | + | ||
51 | + # | ||
52 | + # if user didn't specify, use DEFAULT_LIBPNG | ||
53 | + # | ||
54 | + if test "x${with_libpng}" = "x"; then | ||
55 | + with_libpng=${DEFAULT_LIBPNG} | ||
56 | + fi | ||
57 | + | ||
58 | + | ||
59 | + if test "x${with_libpng}" = "xbundled"; then | ||
60 | + USE_EXTERNAL_LIBPNG=false | ||
61 | + AC_MSG_RESULT([bundled]) | ||
62 | + elif test "x${with_libpng}" = "xsystem"; then | ||
63 | + if test "x${LIBPNG_FOUND}" = "xyes"; then | ||
64 | + USE_EXTERNAL_LIBPNG=true | ||
65 | + AC_MSG_RESULT([system]) | ||
66 | + else | ||
67 | + AC_MSG_RESULT([system not found]) | ||
68 | + AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!]) | ||
69 | + fi | ||
70 | + else | ||
71 | + AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled']) | ||
72 | + fi | ||
73 | + AC_SUBST(USE_EXTERNAL_LIBPNG) | ||
74 | + | ||
75 | ############################################################################### | ||
76 | # | ||
77 | # Check for the zlib library | ||
78 | -- | ||
79 | 2.24.1 | ||
80 | |||