From ff578f4451a0a199202e576b647840910b4d3f59 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 24 Apr 2019 13:26:09 +0200 Subject: gtk-doc.bbclass: unify option setting for meson-based recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is done similarly to gobject-introspection work by Andreas Müller, and allows dropping duplicate clutter from the recipes. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/atk/at-spi2-core_2.30.0.bb | 6 +----- meta/recipes-support/atk/atk_2.30.0.bb | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'meta/recipes-support/atk') diff --git a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb index 36e8a9ef48..cfe0ddeef2 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb @@ -22,11 +22,7 @@ inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \ -Ddbus_daemon=${bindir}/dbus-daemon" -GTKDOC_ENABLE_FLAG = "-Denable_docs=true" -GTKDOC_DISABLE_FLAG = "-Denable_docs=false" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " +GTKDOC_MESON_OPTION = "enable_docs" GIR_MESON_OPTION = 'enable-introspection' GIR_MESON_ENABLE_FLAG = 'yes' diff --git a/meta/recipes-support/atk/atk_2.30.0.bb b/meta/recipes-support/atk/atk_2.30.0.bb index 84fdb1510a..4e22b3f811 100644 --- a/meta/recipes-support/atk/atk_2.30.0.bb +++ b/meta/recipes-support/atk/atk_2.30.0.bb @@ -14,12 +14,6 @@ DEPENDS = "gettext-native glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -GTKDOC_ENABLE_FLAG = "-Ddocs=true" -GTKDOC_DISABLE_FLAG = "-Ddocs=false" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " - SRC_URI_append = " \ file://0001-meson.build-enable-introspection-for-cross-compile.patch \ file://0001-Switch-from-filename-to-basename.patch \ -- cgit 1.2.3-korg