diff options
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 | |||