diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:53:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-29 15:15:47 +0100 |
| commit | ef967c70182eeccb59c7511d838a7ecb0b2315c1 (patch) | |
| tree | fd801c62907115b9e8377f835ff4eb688e0c6bb2 /meta/recipes-gnome/gtk+ | |
| parent | b7ab82485e4514e07ab8a76e554da27ddc92e6c0 (diff) | |
| download | openembedded-core-ef967c70182eeccb59c7511d838a7ecb0b2315c1.tar.gz openembedded-core-ef967c70182eeccb59c7511d838a7ecb0b2315c1.tar.bz2 openembedded-core-ef967c70182eeccb59c7511d838a7ecb0b2315c1.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index be5273d620..a197b9d96f 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" SECTION = "libs" inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "directfb x11" +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite" DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ 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 \ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings +inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # This should be in autotools.bbclass, but until something elses uses it putting # it here avoids rebuilding everything. |