diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-23 14:52:05 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:54:50 +0100 |
| commit | 9927a3d72e2272d8e3dc4785ba02e27802ee1c6c (patch) | |
| tree | fc94a50205cf856e239b4c241245b491fad66906 /meta/classes | |
| parent | 1a41953331f42d69c0201dcfcbb7d8dc12422fde (diff) | |
| download | openembedded-core-9927a3d72e2272d8e3dc4785ba02e27802ee1c6c.tar.gz openembedded-core-9927a3d72e2272d8e3dc4785ba02e27802ee1c6c.tar.bz2 openembedded-core-9927a3d72e2272d8e3dc4785ba02e27802ee1c6c.zip | |
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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/gobject-introspection-data.bbclass | 9 | ||||
| -rw-r--r-- | meta/classes/gobject-introspection.bbclass | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/meta/classes/gobject-introspection-data.bbclass b/meta/classes/gobject-introspection-data.bbclass new file mode 100644 index 0000000000..b1bdd268e6 --- /dev/null +++ b/meta/classes/gobject-introspection-data.bbclass @@ -0,0 +1,9 @@ +# This variable is set to True if gobject-introspection-data is in +# DISTRO_FEATURES and qemu-usermode is in MACHINE_FEATURES, and False otherwise. +# +# It should be used in recipes to determine whether introspection data should be built, +# so that qemu use can be avoided when necessary. +GI_DATA_ENABLED = "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', \ + bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d), 'False', d)}" + + 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 -# of qemu) in recipes if gobject-introspection-data is omitted from -# DISTRO_FEATURES or MACHINE_FEATURES. -EXTRA_OECONF_prepend = "${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection', '--disable-introspection', d)} " +# This sets up autoconf-based recipes to build introspection data (or not), +# depending on distro and machine features (see gobject-introspection-data class). +inherit gobject-introspection-data +EXTRA_OECONF_prepend = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} " UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" |