summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 15:35:59 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-28 15:09:31 +0100
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.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/0001-Allow-using-a-system-installed-libjpeg.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch77
1 files changed, 77 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch
new file mode 100644
index 0000000..e9662eb
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch
@@ -0,0 +1,77 @@
1From 836aad60652299a26341b46a4a9a2e6c418b6947 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 13:36:53 +0000
4Subject: [PATCH 01/10] Allow using a system-installed libjpeg
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Patch stolen (and some typos corrected) from debian patch,
10which itself was a backport from:
11 http://hg.openjdk.java.net/jdk9/client/rev/bfd9a3e1aeb5
12 http://hg.openjdk.java.net/jdk9/client/jdk/rev/320743f0b4fc
13
14Issues fixed on top of debian patch:
15 * imageIOJPEG.c -> imageioJPEG.c
16 * $(LIBJPEG_LIBS) must be added to LDFLAGS_SUFFIX, not
17 LDFLAGS as it otherwise doesn't make it into the linker
18 command line and then fails when using -Wl,-z,now in
19 LDFLAGS (as done when 'security' is enabled)
20
21Upstream-Status: Backport
22
23Signed-off-by: André Draszik <andre.draszik@jci.com>
24Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
25---
26 common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++-----
27 1 file changed, 30 insertions(+), 5 deletions(-)
28
29diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
30index 6d803f9..d2732eb 100644
31--- a/common/autoconf/libraries.m4
32+++ b/common/autoconf/libraries.m4
33@@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
34 # Check for the jpeg library
35 #
36
37- USE_EXTERNAL_LIBJPEG=true
38- AC_CHECK_LIB(jpeg, main, [],
39- [ USE_EXTERNAL_LIBJPEG=false
40- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
41- ])
42+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
43+ [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
44+
45+ AC_MSG_CHECKING([for which libjpeg to use])
46+
47+ # default is bundled
48+ DEFAULT_LIBJPEG=bundled
49+
50+ #
51+ # if user didn't specify, use DEFAULT_LIBJPEG
52+ #
53+ if test "x${with_libjpeg}" = "x"; then
54+ with_libjpeg=${DEFAULT_LIBJPEG}
55+ fi
56+
57+ AC_MSG_RESULT(${with_libjpeg})
58+
59+ if test "x${with_libjpeg}" = "xbundled"; then
60+ USE_EXTERNAL_LIBJPEG=false
61+ elif test "x${with_libjpeg}" = "xsystem"; then
62+ AC_CHECK_HEADER(jpeglib.h, [],
63+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])])
64+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [],
65+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])])
66+
67+ USE_EXTERNAL_LIBJPEG=true
68+ else
69+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
70+ fi
71+
72 AC_SUBST(USE_EXTERNAL_LIBJPEG)
73
74 ###############################################################################
75--
762.24.1
77