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:55:49 +0100 |
commit | abd5b24ff7f94875d69fca664e9d9ff8ac35c0ad (patch) | |
tree | e45f0be2ce5c8d027bbcb11face72a74afd445e4 /meta/recipes-sato | |
parent | f81065f5b2313fc4d967c0144b90838f33e6ff60 (diff) | |
download | poky-abd5b24ff7f94875d69fca664e9d9ff8ac35c0ad.tar.gz |
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 <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.10.7.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb index 849a33a1e7..8eb6b9f3b2 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb | |||
@@ -54,7 +54,7 @@ PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" | |||
54 | EXTRA_OECMAKE = " \ | 54 | EXTRA_OECMAKE = " \ |
55 | -DPORT=GTK \ | 55 | -DPORT=GTK \ |
56 | -DCMAKE_BUILD_TYPE=Release \ | 56 | -DCMAKE_BUILD_TYPE=Release \ |
57 | ${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ | 57 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ |
58 | -DENABLE_GTKDOC=OFF \ | 58 | -DENABLE_GTKDOC=OFF \ |
59 | -DENABLE_MINIBROWSER=ON \ | 59 | -DENABLE_MINIBROWSER=ON \ |
60 | " | 60 | " |