aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-11-25 15:05:40 +0200
committerSaul Wold <sgw@linux.intel.com>2016-02-02 08:03:51 -0800
commitb1175339287395a7ad4fe4639a73f3a1dda74358 (patch)
treeeee664261508b27627a521efd6411a335b7ea161
parent05cab660ea956aabf6e6f971bdc5c9e2d94b9f2d (diff)
downloadopenembedded-core-contrib-b1175339287395a7ad4fe4639a73f3a1dda74358.tar.gz
openembedded-core-contrib-b1175339287395a7ad4fe4639a73f3a1dda74358.tar.bz2
openembedded-core-contrib-b1175339287395a7ad4fe4639a73f3a1dda74358.zip
gcr: Require x11 DISTRO_FEATURE
This enables a world build without x11. GTK3DISTROFEATURES is not enough because gtk+-x11.pc is still required. Fixes [YOCTO #8611]. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit dbdcd87144cc1cd6c5d50c800c7f266aaf25ca17) Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.16.0.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
index 4c9fe2ec89..e50b3a8155 100644
--- a/meta/recipes-gnome/gcr/gcr_3.16.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt vala"
-inherit autotools gnomebase gtk-icon-cache gtk-doc
+inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check
+# depends on gtk+3, but also x11 through gtk+-x11
+REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI[archive.md5sum] = "d5835680be0b6a838e02a528d5378d9c"
SRC_URI[archive.sha256sum] = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075"