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+/gtk+3.inc | |
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+/gtk+3.inc')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index f29f0d3031..558cdd7340 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -10,7 +10,8 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ | |||
10 | 10 | ||
11 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" | 11 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" |
12 | 12 | ||
13 | inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings | 13 | inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check |
14 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
14 | 15 | ||
15 | # This should be in autotools.bbclass, but until something elses uses it putting | 16 | # This should be in autotools.bbclass, but until something elses uses it putting |
16 | # it here avoids rebuilding everything. | 17 | # it here avoids rebuilding everything. |