summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2018-05-10 09:09:56 -0700
committerHenning Heinold <henning@itconsulting-heinold.de>2018-06-06 22:49:01 +0200
commitd570146f13c0cb34caed05c93cf3ec9fd3e3927e (patch)
treed648284ef6ea6110b9b605fe443caed62c0fedac
parentfcea8888b59e1cc6adcf8647aed80f21f2f028d9 (diff)
downloadmeta-java-d570146f13c0cb34caed05c93cf3ec9fd3e3927e.tar.gz
icetea7, openjdk-8: Fix depenency to xproto -> xorgproto
The latest oe-core has changed the X protocol header provider package name. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Reviewed-by: Richard Leitner <richard.leitner@skidata.com> Tested-by: Richard Leitner <richard.leitner@skidata.com> Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc2
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc2
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index d4cf7ac..2c9fa92 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -12,7 +12,7 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \
12 " 12 "
13 13
14PACKAGECONFIG ??= "" 14PACKAGECONFIG ??= ""
15PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-native libxext-native libxrender-native" 15PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
16 16
17OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" 17OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
18CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" 18CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}"
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index d70c946..46f13fd 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -21,7 +21,7 @@ PACKAGECONFIG ??= " \
21 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
22 gif jpeg png zlib \ 22 gif jpeg png zlib \
23" 23"
24PACKAGECONFIG[x11] = "--with-x,,libx11 xproto libxt libxext libxrender libxtst" 24PACKAGECONFIG[x11] = "--with-x,,libx11 xorgproto libxt libxext libxrender libxtst"
25PACKAGECONFIG[cups] = "--with-cups,,cups" 25PACKAGECONFIG[cups] = "--with-cups,,cups"
26PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib" 26PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib"
27 27
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index d674474..b782c32 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -10,7 +10,7 @@ DEPENDS = "\
10SRC_URI_append += "file://handle_extra_output.patch" 10SRC_URI_append += "file://handle_extra_output.patch"
11 11
12PACKAGECONFIG ??= "gif jpeg png zlib" 12PACKAGECONFIG ??= "gif jpeg png zlib"
13PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" 13PACKAGECONFIG[x11] = "--with-x,,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
14PACKAGECONFIG[cups] = "--with-cups,,cups" 14PACKAGECONFIG[cups] = "--with-cups,,cups"
15PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" 15PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native"
16PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib-native" 16PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib-native"