summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-11-02 14:52:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-26 12:10:35 +0000
commit1e084f9d755e3458d2f9863382fa3bb7877a146d (patch)
tree6009dd88739d9a735c3057e4f6edb9d339746cb4 /meta/recipes-devtools/qemu
parent937663bdeca6d6479e0db2a9578588b1aa20222c (diff)
downloadpoky-1e084f9d755e3458d2f9863382fa3bb7877a146d.tar.gz
qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng
Use PACKAGECONFIG to explicitly address vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng dependencies rather than tested by configure. It avoided potential errors while multiple builds shared a common state_cache. (From OE-Core rev: 4482af07df26644885bae49b98f5d765a5caa68c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc16
1 files changed, 13 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 21ce4891e1..747d6b23e1 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -24,10 +24,9 @@ SRC_URI_append_class-native = "\
24 file://fix-libcap-header-issue-on-some-distro.patch \ 24 file://fix-libcap-header-issue-on-some-distro.patch \
25 " 25 "
26 26
27EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'" 27EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --audio-drv-list=oss,alsa --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'"
28 28
29EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ 29EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror \
30 --disable-curl \
31 " 30 "
32export LIBTOOL="${HOST_SYS}-libtool" 31export LIBTOOL="${HOST_SYS}-libtool"
33 32
@@ -81,6 +80,17 @@ PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap a
81PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," 80PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio,"
82PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," 81PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs,"
83PACKAGECONFIG[xen] = "--enable-xen, --disable-xen,," 82PACKAGECONFIG[xen] = "--enable-xen, --disable-xen,,"
83PACKAGECONFIG[vnc-tls] = "--enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls,"
84PACKAGECONFIG[vnc-ws] = "--enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls,"
85PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl,"
86PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg,"
87PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng,"
88PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl,"
89PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss,"
90PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
91PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
92PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+ libvte,"
93PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
84 94
85# Qemu target will not build in world build for ARM or Mips 95# Qemu target will not build in world build for ARM or Mips
86BROKEN_qemuarm = "1" 96BROKEN_qemuarm = "1"