summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome-desktop
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 11:53:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:43:32 +0100
commit5bfcd13c074a69cfb1cf9108cbccee472bad4409 (patch)
treedd7184e90b27bd4f5c36e390a1bcddaf3252e2cf /meta/recipes-gnome/gnome-desktop
parent5b629a962d05aa1ae9d017058d078476d3675850 (diff)
downloadpoky-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/gnome-desktop')
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
index 1f2f06c847..aa11fa28d9 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.16.2.bb
@@ -12,6 +12,9 @@ SRC_URI[archive.sha256sum] = "3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a021813
12 12
13DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification iso-codes" 13DEPENDS += "gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils gnome-common startup-notification iso-codes"
14 14
15inherit distro_features_check
16REQUIRED_DISTRO_FEATURES = "x11"
17
15EXTRA_OECONF = "--disable-desktop-docs" 18EXTRA_OECONF = "--disable-desktop-docs"
16 19
17PACKAGES =+ "libgnome-desktop3" 20PACKAGES =+ "libgnome-desktop3"