diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-24 13:26:09 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-25 00:05:20 +0100 |
commit | 07d29e7cec4e03ef1063f29d03aaf54cdc331489 (patch) | |
tree | c6b2b2dcb524840abfd923695269869559f72a11 /meta/recipes-gnome | |
parent | 8833afc0e05445978d942cfdc67f5c805dec9415 (diff) | |
download | poky-07d29e7cec4e03ef1063f29d03aaf54cdc331489.tar.gz |
gtk-doc.bbclass: unify option setting for meson-based recipes
This is done similarly to gobject-introspection work by Andreas Müller,
and allows dropping duplicate clutter from the recipes.
(From OE-Core rev: ff578f4451a0a199202e576b647840910b4d3f59)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
3 files changed, 2 insertions, 13 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb index e423b99687..7fef697f3f 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb | |||
@@ -34,14 +34,8 @@ SRC_URI[sha256sum] = "dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbb | |||
34 | 34 | ||
35 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package | 35 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package |
36 | 36 | ||
37 | GTKDOC_ENABLE_FLAG = "-Ddocs=true" | ||
38 | GTKDOC_DISABLE_FLAG = "-Ddocs=false" | ||
39 | |||
40 | GIR_MESON_OPTION = 'gir' | 37 | GIR_MESON_OPTION = 'gir' |
41 | 38 | ||
42 | EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ | ||
43 | '${GTKDOC_DISABLE_FLAG}', d)} " | ||
44 | |||
45 | EXTRA_OEMESON_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dinstalled_tests=true', '-Dinstalled_tests=false', d)}" | 39 | EXTRA_OEMESON_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dinstalled_tests=true', '-Dinstalled_tests=false', d)}" |
46 | 40 | ||
47 | LIBV = "2.10.0" | 41 | LIBV = "2.10.0" |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb index f87597f190..40beab0c41 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.1.bb | |||
@@ -28,6 +28,8 @@ SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-fo | |||
28 | 28 | ||
29 | inherit meson pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script | 29 | inherit meson pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script |
30 | 30 | ||
31 | GTKDOC_MESON_OPTION = "gtk_doc" | ||
32 | |||
31 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" | 33 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" |
32 | 34 | ||
33 | DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" | 35 | DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" |
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb b/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb index 31c008db47..1c663f93e1 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb | |||
@@ -19,13 +19,6 @@ SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9f | |||
19 | 19 | ||
20 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" | 20 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" |
21 | 21 | ||
22 | # This builds both API docs (via gtk-doc) | ||
23 | GTKDOC_ENABLE_FLAG = "-Ddocs=true" | ||
24 | GTKDOC_DISABLE_FLAG = "-Ddocs=false" | ||
25 | |||
26 | EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ | ||
27 | '${GTKDOC_DISABLE_FLAG}', d)} " | ||
28 | |||
29 | do_install_append() { | 22 | do_install_append() { |
30 | if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then | 23 | if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then |
31 | rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} | 24 | rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} |