From 7e48b81929fec1b8b79686b9dc50ba47eccd5620 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 5 Mar 2018 09:31:00 +0000 Subject: openjdk-8: add patches to support building against system libpng & libjpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This didn't actually before. Patches taken from Debian / OpenJDK-9. Signed-off-by: André Draszik Signed-off-by: Maxin B. John --- recipes-core/openjdk/openjdk-8-native.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes-core/openjdk/openjdk-8-native.inc') diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index 20e1743..10b31bc 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc @@ -2,7 +2,7 @@ JDK_DIR = "openjdk-8-native" DEPENDS = "\ icedtea7-native ant-native \ libxslt-native attr-native \ - giflib-native jpeg-native libpng-native \ + giflib-native \ glib-2.0-native freetype-native fontconfig-native \ zlib-native zip-native \ unzip-native make-native \ @@ -11,11 +11,13 @@ DEPENDS = "\ SRC_URI_append += "file://handle_extra_output.patch" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "jpeg png" PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" PACKAGECONFIG[cups] = "--with-cups,,cups" PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," +PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native" +PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" EXTRA_OECONF_append = "\ --with-jobs=${@java_get_parallel_make(d)} \ -- cgit v1.2.3-54-g00ecf