From 18227f63cae48b277ae69daaed739f657f893152 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 5 Mar 2018 09:31:03 +0000 Subject: openjdk-8: rename PACKAGECONFIG zip -> zlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The existing PACKAGECONFIG option 'zip' affects OpenJDK's usage of zlib, not zip, so this option is a bit inconsistent and confusing. Rename to zlib. Signed-off-by: André Draszik Signed-off-by: Maxin B. John --- recipes-core/openjdk/openjdk-8-cross.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 8a24b14..922c2ae 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc @@ -19,7 +19,7 @@ PACKAGECONFIG ??= " \ repack \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 cups', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - gif jpeg png zip \ + gif jpeg png zlib \ " PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender libxtst" PACKAGECONFIG[cups] = "--with-cups,,cups" @@ -27,10 +27,10 @@ PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib" PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," -PACKAGECONFIG[zip] = "--with-zlib=system,--with-zlib=bundled,zlib," PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib," PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg," PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng," +PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib," export WANT_LLVM_RELEASE = "3.5.2" PACKAGECONFIG[zero] = "--with-jvm-variants=zero,,," -- cgit v1.2.3-54-g00ecf