From abd5b24ff7f94875d69fca664e9d9ff8ac35c0ad Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 23 Mar 2016 14:52:05 +0200 Subject: bitbake.conf: rename 'gobject-introspection-data' machine feature to 'qemu-usermode' The new value is more general and better reflects what having the feature really means. Introspection data, then, is built only if 'gobject-introspection-data' is in DISTRO_FEATURES and 'qemu-usermode' is in MACHINE_FEATURES. (From OE-Core rev: 9927a3d72e2272d8e3dc4785ba02e27802ee1c6c) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gobject-introspection/gobject-introspection_1.46.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb index b8b88234e7..9b16147da3 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb @@ -16,7 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/1.46/${BPN}-${PV}.tar.xz \ SRC_URI[md5sum] = "adb40a31c7c80b65b0f4c8fd71b493dc" SRC_URI[sha256sum] = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233" -inherit autotools pkgconfig gtk-doc pythonnative qemu +inherit autotools pkgconfig gtk-doc pythonnative qemu gobject-introspection-data BBCLASSEXTEND = "native" # necessary to let the call for python-config from configure.ac succeed @@ -105,7 +105,7 @@ EOF EXTRA_OECONF_class-target += "--enable-host-gi \ --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ - ${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection-data', '--disable-introspection-data', d)} \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection-data', '--disable-introspection-data', d)} \ " -- cgit 1.2.3-korg