summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-22 16:21:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-26 13:09:09 +0000
commit181b9a7ee21ada20150ef6329c728db2d331456a (patch)
treea7d45918ea11550762ba49501ff07083da5c64a7 /meta
parentc6459ca4943312b7b00bf97160f29776d2a6a183 (diff)
downloadpoky-181b9a7ee21ada20150ef6329c728db2d331456a.tar.gz
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 <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/json-glib/json-glib_1.4.2.bb13
1 files 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"
14SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8" 14SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"
15 15
16GNOMEBASEBUILDCLASS = "meson" 16GNOMEBASEBUILDCLASS = "meson"
17inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext 17inherit gnomebase lib_package gobject-introspection gtk-doc gettext
18 18
19GTKDOC_ENABLE_FLAG = "-Denable-gtk-doc=true" 19# This builds both API docs (via gtk-doc) and manpages
20GTKDOC_DISABLE_FLAG = "-Denable-gtk-doc=false" 20GTKDOC_ENABLE_FLAG = "-Ddocs=true"
21GTKDOC_DISABLE_FLAG = "-Ddocs=false"
21 22
22GI_ENABLE_FLAG = "-Ddisable_introspection=false" 23GI_ENABLE_FLAG = "-Dintrospection=true"
23GI_DISABLE_FLAG = "-Ddisable_introspection=true" 24GI_DISABLE_FLAG = "-Dintrospection=false"
24 25
25EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ 26EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
26 '${GTKDOC_DISABLE_FLAG}', d)} " 27 '${GTKDOC_DISABLE_FLAG}', d)} "
27EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ 28EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
28 '${GI_DISABLE_FLAG}', d)} " 29 '${GI_DISABLE_FLAG}', d)} "
29 30
30PACKAGECONFIG[manpages] = "-Denable-man=true, -Denable-man=false, libxslt-native xmlto-native"
31
32do_install_append() { 31do_install_append() {
33 # FIXME: these need to be provided via ptest 32 # FIXME: these need to be provided via ptest
34 rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} 33 rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir}