From 58922a43f93f89dcf344394d8b1c84d82276b6a5 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 9 May 2017 13:30:20 +0100 Subject: gcr: add missing dependency on xsltproc if introspection is enabled gcr needs xsltproc at build time if GObject Introspection is enabled. Also, remove the explicit disabling of g-i and gtk-doc on x86-64 targets, this appears to work now. Signed-off-by: Ross Burton --- meta/recipes-gnome/gcr/gcr_3.20.0.bb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.20.0.bb index f31abced02..4450e155e6 100644 --- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.20.0.bb @@ -5,7 +5,8 @@ BUGTRACKER = "https://bugzilla.gnome.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt" +DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection # depends on gtk+3, but also x11 through gtk+-x11 @@ -23,16 +24,3 @@ FILES_${PN} += " \ # http://errors.yoctoproject.org/Errors/Details/20229/ ARM_INSTRUCTION_SET = "arm" - -# on x86-64 the introspection binary goes into -# an infinite loop under qemu during compilation, -# printing the following: -# -# gcrypt-Message: select() error: Bad address -# -# gcrypt-Message: select() error: Bad address -# -# gcrypt-Message: select() error: Bad address -# -# This will be investigated later. -EXTRA_OECONF_append_x86-64 = " --disable-introspection --disable-gtk-doc" -- cgit 1.2.3-korg