diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-01-22 16:21:19 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-26 13:07:20 +0000 |
| commit | e71ecc6a288d1b552248e6f05e8694eb96b5af5c (patch) | |
| tree | 7e9adcc78f8e77582c7710ddfeeda844a79b37f8 | |
| parent | 42e0de37d18f072dc5dcf5dc45cb441e4c2110d8 (diff) | |
| download | openembedded-core-e71ecc6a288d1b552248e6f05e8694eb96b5af5c.tar.gz openembedded-core-e71ecc6a288d1b552248e6f05e8694eb96b5af5c.tar.bz2 openembedded-core-e71ecc6a288d1b552248e6f05e8694eb96b5af5c.zip | |
json-glib: fix meson flags for introspection and documentation
Upstream has renamed them all, and folded manpages building
into the overall 'docs' option.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-gnome/json-glib/json-glib_1.4.2.bb | 13 |
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" 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} |