From 181b9a7ee21ada20150ef6329c728db2d331456a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 22 Jan 2018 16:21:19 +0200 Subject: json-glib: fix meson flags for introspection and documentation Upstream has renamed them all, and folded manpages building into the overall 'docs' option. (From OE-Core rev: e71ecc6a288d1b552248e6f05e8694eb96b5af5c) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/json-glib/json-glib_1.4.2.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb b/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb index fad0a2df36..dd67a8907b 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb @@ -14,21 +14,20 @@ SRC_URI[archive.md5sum] = "35107e23a7bbbc70f31c34f7b9adf1c3" SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext +inherit gnomebase lib_package gobject-introspection gtk-doc gettext -GTKDOC_ENABLE_FLAG = "-Denable-gtk-doc=true" -GTKDOC_DISABLE_FLAG = "-Denable-gtk-doc=false" +# This builds both API docs (via gtk-doc) and manpages +GTKDOC_ENABLE_FLAG = "-Ddocs=true" +GTKDOC_DISABLE_FLAG = "-Ddocs=false" -GI_ENABLE_FLAG = "-Ddisable_introspection=false" -GI_DISABLE_FLAG = "-Ddisable_introspection=true" +GI_ENABLE_FLAG = "-Dintrospection=true" +GI_DISABLE_FLAG = "-Dintrospection=false" EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ '${GTKDOC_DISABLE_FLAG}', d)} " EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ '${GI_DISABLE_FLAG}', d)} " -PACKAGECONFIG[manpages] = "-Denable-man=true, -Denable-man=false, libxslt-native xmlto-native" - do_install_append() { # FIXME: these need to be provided via ptest rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} -- cgit v1.2.3-54-g00ecf