diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2019-02-26 10:50:25 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-28 17:47:10 +0000 |
commit | 8c662e768fc7c1a9e3769790bd3de0e2029df9cb (patch) | |
tree | c7ebd5141196c2284c9b1e005c981012d85b0053 /meta | |
parent | 55b0f515bf7bd9f934a6ce5f77491093049a49c8 (diff) | |
download | poky-8c662e768fc7c1a9e3769790bd3de0e2029df9cb.tar.gz |
libdazzle: add check for GTK3DISTROFEATURES
When do world buid, there comes below error:
| ERROR: Nothing PROVIDES 'gtk+3' (but /build/layers/oe-core/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb DEPENDS on or otherwise requires it)
| gtk+3 was skipped: one of 'x11 wayland' needs to be in DISTRO_FEATURES
Add the check for GTK3DISTROFEATURES to make
the world build work even without GTK3DISTROFEATURES.
(From OE-Core rev: 5e66a6b4540e5e29f401f7490e9b3b2029ea94a5)
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb index 5441c10f99..3779b15af9 100644 --- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb +++ b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "GPLv3+" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" |
4 | 4 | ||
5 | GNOMEBASEBUILDCLASS = "meson" | 5 | GNOMEBASEBUILDCLASS = "meson" |
6 | inherit gnomebase upstream-version-is-even vala gobject-introspection | 6 | inherit gnomebase upstream-version-is-even vala distro_features_check gobject-introspection |
7 | 7 | ||
8 | DEPENDS = "glib-2.0-native glib-2.0 gtk+3" | 8 | DEPENDS = "glib-2.0-native glib-2.0 gtk+3" |
9 | 9 | ||
@@ -14,5 +14,7 @@ SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf7293311 | |||
14 | GI_ENABLE_FLAG = "-Dwith_introspection=true" | 14 | GI_ENABLE_FLAG = "-Dwith_introspection=true" |
15 | GI_DISABLE_FLAG = "-Dwith_introspection=false" | 15 | GI_DISABLE_FLAG = "-Dwith_introspection=false" |
16 | 16 | ||
17 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
18 | |||
17 | EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ | 19 | EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ |
18 | '${GI_DISABLE_FLAG}', d)} " | 20 | '${GI_DISABLE_FLAG}', d)} " |