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-28 15:09:31 +0100 |
commit | 7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch) | |
tree | 398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | |
parent | 19b569281cc30e3aa94e772d6885cd340b1d1724 (diff) | |
download | meta-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/2003-jdk-Allow-using-a-system-installed-libpng.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch new file mode 100644 index 0000000..13d3045 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | From bdf8cb302ab7c8f11b676f93da482cd4a9405ce4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Tue, 27 Feb 2018 13:43:04 +0000 | ||
4 | Subject: [PATCH 2003/2008] jdk: 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 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
20 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
21 | --- | ||
22 | make/lib/Awt2dLibraries.gmk | 12 +++++++++--- | ||
23 | .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- | ||
24 | 2 files changed, 10 insertions(+), 5 deletions(-) | ||
25 | |||
26 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | ||
27 | index 12b9da11d..cd8b94cd8 100644 | ||
28 | --- a/jdk/make/lib/Awt2dLibraries.gmk | ||
29 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | ||
30 | @@ -1148,7 +1148,6 @@ endif | ||
31 | ifndef BUILD_HEADLESS_ONLY | ||
32 | LIBSPLASHSCREEN_DIRS := \ | ||
33 | $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ | ||
34 | - $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \ | ||
35 | $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen | ||
36 | |||
37 | ifeq ($(USE_EXTERNAL_LIBGIF), true) | ||
38 | @@ -1165,6 +1164,13 @@ ifndef BUILD_HEADLESS_ONLY | ||
39 | LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg | ||
40 | endif | ||
41 | |||
42 | + ifeq ($(USE_EXTERNAL_LIBPNG), true) | ||
43 | + LIBPNG_LDFLAGS := -lpng | ||
44 | + else | ||
45 | + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng | ||
46 | + LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng | ||
47 | + endif | ||
48 | + | ||
49 | ifneq ($(OPENJDK_TARGET_OS), macosx) | ||
50 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen | ||
51 | else | ||
52 | @@ -1222,12 +1228,12 @@ ifndef BUILD_HEADLESS_ONLY | ||
53 | LANG := C, \ | ||
54 | OPTIMIZATION := LOW, \ | ||
55 | CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ | ||
56 | - $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS), \ | ||
57 | + $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS), \ | ||
58 | MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ | ||
59 | LDFLAGS := $(LDFLAGS_JDKLIB) \ | ||
60 | $(call SET_SHARED_LIBRARY_ORIGIN), \ | ||
61 | LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ | ||
62 | - $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS), \ | ||
63 | + $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(LIBPNG_LDFLAGS), \ | ||
64 | LDFLAGS_SUFFIX_solaris := -lc, \ | ||
65 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | ||
66 | RC_FLAGS := $(RC_FLAGS) \ | ||
67 | diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
68 | index 3599433e4..5bf002ea1 100644 | ||
69 | --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
70 | +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | ||
71 | @@ -25,8 +25,7 @@ | ||
72 | |||
73 | #include "splashscreen_impl.h" | ||
74 | |||
75 | -#include "../libpng/png.h" | ||
76 | - | ||
77 | +#include <png.h> | ||
78 | #include <setjmp.h> | ||
79 | |||
80 | #define SIG_BYTES 8 | ||
81 | -- | ||
82 | 2.24.1 | ||
83 | |||