1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
index d8b8b3ed27..2d73e402ce 100644
--- a/meta/classes/gobject-introspection.bbclass
+++ b/meta/classes/gobject-introspection.bbclass
@@ -1,9 +1,9 @@
 # Inherit this class in recipes to enable building their introspection files
-# This allows disabling introspection support (and therefore avoiding the use
+# This sets up autoconf-based recipes to build introspection data (or not),
-# of qemu) in recipes if gobject-introspection-data is omitted from
+# depending on distro and machine features (see gobject-introspection-data class).
-# DISTRO_FEATURES or MACHINE_FEATURES.
+inherit gobject-introspection-data
-EXTRA_OECONF_prepend = "${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection', '--disable-introspection', d)} "
+EXTRA_OECONF_prepend = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} "
 UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"

diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass index d8b8b3ed27..2d73e402ce 100644 --- a/meta/classes/gobject-introspection.bbclass +++ b/meta/classes/gobject-introspection.bbclass
@@ -1,9 +1,9 @@
1	# Inherit this class in recipes to enable building their introspection files	1	# Inherit this class in recipes to enable building their introspection files
2		2
3	# This allows disabling introspection support (and therefore avoiding the use	3	# This sets up autoconf-based recipes to build introspection data (or not),
4	# of qemu) in recipes if gobject-introspection-data is omitted from	4	# depending on distro and machine features (see gobject-introspection-data class).
5	# DISTRO_FEATURES or MACHINE_FEATURES.	5	inherit gobject-introspection-data
6	EXTRA_OECONF_prepend = "${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection', '--disable-introspection', d)} "	6	EXTRA_OECONF_prepend = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} "
7		7
8	UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"	8	UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"
9		9