[oe-commits] [openembedded-core] 17/19: qemu: only build SDL UI if X11 is enabled

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 990863f60b1e9301036bd85a5e7880c3b612e99e
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Jun 5 13:49:43 2018 +0100

    qemu: only build SDL UI if X11 is enabled
    
    The SDL UI now assumes that it is using X11 because it includes X headers, so
    only enable it if X11 is enabled.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/qemu/qemu.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index faaea78..2f73b21 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -74,11 +74,12 @@ do_install_append() {
 # END of qemu-mips workaround
 
 PACKAGECONFIG ??= " \
-    fdt sdl kvm \
+    fdt kvm \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sdl', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
 "
 PACKAGECONFIG_class-native ??= "fdt alsa kvm"
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
+PACKAGECONFIG_class-nativesdk ??= "fdt kvm ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sdl', '', d)}"
 
 # Handle distros such as CentOS 5 32-bit that do not have kvm support
 PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.