diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-11-02 14:52:59 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-09 11:04:12 +0000 |
commit | ceacf28277eb2acc4b00788715c340042dde1036 (patch) | |
tree | d956aee7dfb16df763b2867cbf613d31cb7aa13b /meta/recipes-devtools | |
parent | a639dd8673f54cc82cb1a9f1373e8543ebd0e57a (diff) | |
download | poky-ceacf28277eb2acc4b00788715c340042dde1036.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 master rev: 4482af07df26644885bae49b98f5d765a5caa68c)
(From OE-Core rev: ea9eda2fc54b9dec0f4bd039bcda039388f0a95d)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f147b9d494..1c30699a10 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -28,10 +28,9 @@ SRC_URI_append_class-native = "\ | |||
28 | file://fix-libcap-header-issue-on-some-distro.patch \ | 28 | file://fix-libcap-header-issue-on-some-distro.patch \ |
29 | " | 29 | " |
30 | 30 | ||
31 | EXTRA_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}'" | 31 | EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --audio-drv-list=oss,alsa --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'" |
32 | 32 | ||
33 | EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ | 33 | EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror \ |
34 | --disable-curl \ | ||
35 | " | 34 | " |
36 | export LIBTOOL="${HOST_SYS}-libtool" | 35 | export LIBTOOL="${HOST_SYS}-libtool" |
37 | 36 | ||
@@ -85,6 +84,17 @@ PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap a | |||
85 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," | 84 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," |
86 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," | 85 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," |
87 | PACKAGECONFIG[xen] = "--enable-xen, --disable-xen,," | 86 | PACKAGECONFIG[xen] = "--enable-xen, --disable-xen,," |
87 | PACKAGECONFIG[vnc-tls] = "--enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls," | ||
88 | PACKAGECONFIG[vnc-ws] = "--enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls," | ||
89 | PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl," | ||
90 | PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg," | ||
91 | PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," | ||
92 | PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," | ||
93 | PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss," | ||
94 | PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," | ||
95 | PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," | ||
96 | PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+ libvte," | ||
97 | PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," | ||
88 | 98 | ||
89 | # Qemu target will not build in world build for ARM or Mips | 99 | # Qemu target will not build in world build for ARM or Mips |
90 | BROKEN_qemuarm = "1" | 100 | BROKEN_qemuarm = "1" |