aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-03-05 09:31:01 +0000
committerMaxin B. John <maxin.john@intel.com>2018-03-06 10:57:17 +0200
commit3caa4c62d376cf5c955caf60a5053b2d3d0accc3 (patch)
tree35d71b680d9b86e0385dbcc36d0d570d1967840c /recipes-core/openjdk
parent7e48b81929fec1b8b79686b9dc50ba47eccd5620 (diff)
downloadmeta-java-3caa4c62d376cf5c955caf60a5053b2d3d0accc3.tar.gz
meta-java-3caa4c62d376cf5c955caf60a5053b2d3d0accc3.tar.bz2
meta-java-3caa4c62d376cf5c955caf60a5053b2d3d0accc3.zip
openjdk-8-native: really use system libgif & zlib
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 <andre.draszik@jci.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc8
1 files 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)} \