diff options
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.patch | 77 |
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 @@ | |||
1 | From 836aad60652299a26341b46a4a9a2e6c418b6947 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:36:53 +0000 | ||
4 | Subject: [PATCH 01/10] Allow using a system-installed libjpeg | ||
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/client/rev/bfd9a3e1aeb5 | ||
12 | http://hg.openjdk.java.net/jdk9/client/jdk/rev/320743f0b4fc | ||
13 | |||
14 | Issues 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 | |||
21 | Upstream-Status: Backport | ||
22 | |||
23 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
24 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
25 | --- | ||
26 | common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++----- | ||
27 | 1 file changed, 30 insertions(+), 5 deletions(-) | ||
28 | |||
29 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | ||
30 | index 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 | -- | ||
76 | 2.24.1 | ||
77 | |||