diff options
author | André Draszik <andre.draszik@jci.com> | 2018-03-05 09:31:01 +0000 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-03-06 10:57:17 +0200 |
commit | 3caa4c62d376cf5c955caf60a5053b2d3d0accc3 (patch) | |
tree | 35d71b680d9b86e0385dbcc36d0d570d1967840c /recipes-core | |
parent | 7e48b81929fec1b8b79686b9dc50ba47eccd5620 (diff) | |
download | meta-java-3caa4c62d376cf5c955caf60a5053b2d3d0accc3.tar.gz |
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')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-native.inc | 8 |
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" | |||
2 | DEPENDS = "\ | 2 | DEPENDS = "\ |
3 | icedtea7-native ant-native \ | 3 | icedtea7-native ant-native \ |
4 | libxslt-native attr-native \ | 4 | libxslt-native attr-native \ |
5 | giflib-native \ | ||
6 | glib-2.0-native freetype-native fontconfig-native \ | 5 | glib-2.0-native freetype-native fontconfig-native \ |
7 | zlib-native zip-native \ | 6 | zip-native unzip-native make-native \ |
8 | unzip-native make-native \ | ||
9 | ca-certificates-native openssl-native coreutils-native \ | 7 | ca-certificates-native openssl-native coreutils-native \ |
10 | " | 8 | " |
11 | 9 | ||
12 | SRC_URI_append += "file://handle_extra_output.patch" | 10 | SRC_URI_append += "file://handle_extra_output.patch" |
13 | 11 | ||
14 | PACKAGECONFIG ??= "jpeg png" | 12 | PACKAGECONFIG ??= "gif jpeg png zlib" |
15 | PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" | 13 | PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" |
16 | PACKAGECONFIG[cups] = "--with-cups,,cups" | 14 | PACKAGECONFIG[cups] = "--with-cups,,cups" |
17 | PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" | 15 | PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" |
16 | PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib-native" | ||
18 | PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," | 17 | PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," |
19 | PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native" | 18 | PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native" |
20 | PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" | 19 | PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" |
20 | PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" | ||
21 | 21 | ||
22 | EXTRA_OECONF_append = "\ | 22 | EXTRA_OECONF_append = "\ |
23 | --with-jobs=${@java_get_parallel_make(d)} \ | 23 | --with-jobs=${@java_get_parallel_make(d)} \ |