summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2014-12-11 12:52:57 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 18:07:59 +0000
commit48a03945c303dcf75230bf88b642ba6433f9a5bd (patch)
tree9277d7aece29bf2f64145200eb65dda5b10ecb4d
parent73388a1846c18414c8c499476257367b2b66ea96 (diff)
downloadpoky-48a03945c303dcf75230bf88b642ba6433f9a5bd.tar.gz
qemu: disable vte if gtk is also disabled
vte will pull in the gtk libs itself. This can cause build failures if the native gtk was build with glib>=2.41 while the sysroot native glib is <=2.40. Fix for [YOCTO #7077]. (From OE-Core rev: 6cea10dd8f041731269ad16b94d8e172ab1f7257) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 3f68a56bd3..c9a5d328f9 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -104,7 +104,7 @@ PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl,"
104PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss," 104PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss,"
105PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," 105PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
106PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," 106PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
107PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+ libvte," 107PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+ libvte,"
108PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," 108PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
109PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," 109PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
110PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" 110PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"