summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-03-05 09:31:03 +0000
committerMaxin B. John <maxin.john@intel.com>2018-03-06 10:57:24 +0200
commit18227f63cae48b277ae69daaed739f657f893152 (patch)
treecd45229a0e2bd6c8395ff9f466209caecc696911
parent0add811f1eb9785573fa5e525f928e825ef310f3 (diff)
downloadmeta-java-18227f63cae48b277ae69daaed739f657f893152.tar.gz
openjdk-8: rename PACKAGECONFIG zip -> zlib
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 <andre.draszik@jci.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc4
1 files 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 ??= " \
19 repack \ 19 repack \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 cups', '', d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 cups', '', d)} \
21 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
22 gif jpeg png zip \ 22 gif jpeg png zlib \
23" 23"
24PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender libxtst" 24PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender libxtst"
25PACKAGECONFIG[cups] = "--with-cups,,cups" 25PACKAGECONFIG[cups] = "--with-cups,,cups"
@@ -27,10 +27,10 @@ PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib"
27 27
28PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," 28PACKAGECONFIG[jce] = "--enable-unlimited-crypto,,"
29 29
30PACKAGECONFIG[zip] = "--with-zlib=system,--with-zlib=bundled,zlib,"
31PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib," 30PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib,"
32PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg," 31PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg,"
33PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng," 32PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng,"
33PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib,"
34 34
35export WANT_LLVM_RELEASE = "3.5.2" 35export WANT_LLVM_RELEASE = "3.5.2"
36PACKAGECONFIG[zero] = "--with-jvm-variants=zero,,," 36PACKAGECONFIG[zero] = "--with-jvm-variants=zero,,,"