summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-05-09 13:30:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:30 +0100
commit48e42e75145c0c91203d22b774e684c1ab1ae9b1 (patch)
treebe90c2d8701f9dae293a8cb8adadad097cd349fa
parent9cf88f94cd1d244ae91ce86d74077877975d9ca0 (diff)
downloadpoky-48e42e75145c0c91203d22b774e684c1ab1ae9b1.tar.gz
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. (From OE-Core rev: 58922a43f93f89dcf344394d8b1c84d82276b6a5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.20.0.bb16
1 files 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/"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" 6LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
7 7
8DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt" 8DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt \
9 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
9 10
10inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection 11inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection
11# depends on gtk+3, but also x11 through gtk+-x11 12# depends on gtk+3, but also x11 through gtk+-x11
@@ -23,16 +24,3 @@ FILES_${PN} += " \
23 24
24# http://errors.yoctoproject.org/Errors/Details/20229/ 25# http://errors.yoctoproject.org/Errors/Details/20229/
25ARM_INSTRUCTION_SET = "arm" 26ARM_INSTRUCTION_SET = "arm"
26
27# on x86-64 the introspection binary goes into
28# an infinite loop under qemu during compilation,
29# printing the following:
30#
31# gcrypt-Message: select() error: Bad address
32#
33# gcrypt-Message: select() error: Bad address
34#
35# gcrypt-Message: select() error: Bad address
36#
37# This will be investigated later.
38EXTRA_OECONF_append_x86-64 = " --disable-introspection --disable-gtk-doc"