aboutsummaryrefslogtreecommitdiffstats
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-31 10:17:47 +0000
commit03c2129351b39cf5299c2f531483f77e1aead7fc (patch)
treeb95c6940709caa6adc5fba0c3a40dd17a12eb610
parentdbb6cb42a9113038e437cf417f0b9cb25a285e9f (diff)
downloadopenembedded-core-contrib-03c2129351b39cf5299c2f531483f77e1aead7fc.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> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-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,"
PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss,"
PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
-PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+ libvte,"
+PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+ libvte,"
PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"