diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:53:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 07:43:32 +0100 |
commit | 5bfcd13c074a69cfb1cf9108cbccee472bad4409 (patch) | |
tree | dd7184e90b27bd4f5c36e390a1bcddaf3252e2cf /meta/recipes-gnome/gtk-engines | |
parent | 5b629a962d05aa1ae9d017058d078476d3675850 (diff) | |
download | poky-5bfcd13c074a69cfb1cf9108cbccee472bad4409.tar.gz |
classes/meta: Add DISTRO_FEATURES check for gtk+/gtk3+
If you currently do a DISTRO_FEATURES_remove = "x11" with OE-Core, you
see failures due to dependency problems. The work in resolving this was
partially completed a while back. This adds in the markup mainly for
gtk/gtk3+ recipes and means "bitbake world" will work successfully.
Rather than code the gtk/gtk+ specific distro features into each recipe,
a shared variable is used.
(From OE-Core rev: ef967c70182eeccb59c7511d838a7ecb0b2315c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk-engines')
-rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index c30454cab5..95d5e554d6 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | |||
@@ -34,6 +34,9 @@ RDEPENDS_${PN}-dev = "" | |||
34 | inherit gnomebase | 34 | inherit gnomebase |
35 | GNOME_COMPRESS_TYPE="bz2" | 35 | GNOME_COMPRESS_TYPE="bz2" |
36 | 36 | ||
37 | inherit distro_features_check | ||
38 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
39 | |||
37 | python populate_packages_prepend() { | 40 | python populate_packages_prepend() { |
38 | engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") | 41 | engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") |
39 | themes_root = os.path.join(d.getVar('datadir', True), "themes") | 42 | themes_root = os.path.join(d.getVar('datadir', True), "themes") |