From 3caa4c62d376cf5c955caf60a5053b2d3d0accc3 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 5 Mar 2018 09:31:01 +0000 Subject: openjdk-8-native: really use system libgif & zlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The intention seems to be to build against above system libraries, but configure still picked the bundled versions, even though the libraries are in the sysroot. Make it deterministic and force use of the system libraries using PACKAGECONFIG and the appropriate configure arguments. Signed-off-by: André Draszik Signed-off-by: Maxin B. John --- recipes-core/openjdk/openjdk-8-native.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index 10b31bc..d674474 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc @@ -2,22 +2,22 @@ JDK_DIR = "openjdk-8-native" DEPENDS = "\ icedtea7-native ant-native \ libxslt-native attr-native \ - giflib-native \ glib-2.0-native freetype-native fontconfig-native \ - zlib-native zip-native \ - unzip-native make-native \ + zip-native unzip-native make-native \ ca-certificates-native openssl-native coreutils-native \ " SRC_URI_append += "file://handle_extra_output.patch" -PACKAGECONFIG ??= "jpeg png" +PACKAGECONFIG ??= "gif jpeg png zlib" 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[gif] = "--with-giflib=system,--with-giflib=bundled,giflib-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" +PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" EXTRA_OECONF_append = "\ --with-jobs=${@java_get_parallel_make(d)} \ -- cgit v1.2.3-54-g00ecf