summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-native.inc
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-03-05 09:31:00 +0000
committerMaxin B. John <maxin.john@intel.com>2018-03-06 10:57:12 +0200
commit7e48b81929fec1b8b79686b9dc50ba47eccd5620 (patch)
tree15fdc2e8ed54b7d8cd29150826e04f6c09178008 /recipes-core/openjdk/openjdk-8-native.inc
parentad72b21676a99417605c5b7e6d068ad81142f7b2 (diff)
downloadmeta-java-7e48b81929fec1b8b79686b9dc50ba47eccd5620.tar.gz
openjdk-8: add patches to support building against system libpng & libjpeg
This didn't actually before. Patches taken from Debian / OpenJDK-9. 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/openjdk-8-native.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index 20e1743..10b31bc 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -2,7 +2,7 @@ JDK_DIR = "openjdk-8-native"
2DEPENDS = "\ 2DEPENDS = "\
3 icedtea7-native ant-native \ 3 icedtea7-native ant-native \
4 libxslt-native attr-native \ 4 libxslt-native attr-native \
5 giflib-native jpeg-native libpng-native \ 5 giflib-native \
6 glib-2.0-native freetype-native fontconfig-native \ 6 glib-2.0-native freetype-native fontconfig-native \
7 zlib-native zip-native \ 7 zlib-native zip-native \
8 unzip-native make-native \ 8 unzip-native make-native \
@@ -11,11 +11,13 @@ DEPENDS = "\
11 11
12SRC_URI_append += "file://handle_extra_output.patch" 12SRC_URI_append += "file://handle_extra_output.patch"
13 13
14PACKAGECONFIG ??= "" 14PACKAGECONFIG ??= "jpeg png"
15PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" 15PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native"
16PACKAGECONFIG[cups] = "--with-cups,,cups" 16PACKAGECONFIG[cups] = "--with-cups,,cups"
17PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" 17PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native"
18PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," 18PACKAGECONFIG[jce] = "--enable-unlimited-crypto,,"
19PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native"
20PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native"
19 21
20EXTRA_OECONF_append = "\ 22EXTRA_OECONF_append = "\
21 --with-jobs=${@java_get_parallel_make(d)} \ 23 --with-jobs=${@java_get_parallel_make(d)} \