Try to enable vapi build automatically if GI_DATA_ENABLED = True.
Do it basically the same way it is done for gi
Signed-off-by: Markus Volk <f_...@t-online.de>
---
meta/classes-recipe/vala.bbclass | 23 +++++++++++++++++++
.../libdazzle/libdazzle_3.44.0.bb | 1 +
.../appstream/appstream_0.16.3.bb | 2 --
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta/classes-recipe/vala.bbclass b/meta/classes-recipe/vala.bbclass
index 460ddb36f0..45c3993c54 100644
--- a/meta/classes-recipe/vala.bbclass
+++ b/meta/classes-recipe/vala.bbclass
@@ -16,6 +16,29 @@ export STAGING_DATADIR
# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files
export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}"
+VALA_ENABLED:class-native = "False"
+VALA_ENABLED ?= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'True',
'False', d)}"
+
+# meson: default option name to enable/disable vala. This matches most
+# project's configuration. In doubts - check meson_options.txt in project's
+# source path.
+VALA_MESON_OPTION ?= 'vapi'
+VALA_MESON_ENABLE_FLAG ?= 'true'
+VALA_MESON_DISABLE_FLAG ?= 'false'
+
+# Define vala options such that they can be disabled completely when
VALA_MESON_OPTION is empty
+VALAMESONTARGET = "-D${VALA_MESON_OPTION}=${@bb.utils.contains('VALA_ENABLED',
'True', '${VALA_MESON_ENABLE_FLAG}', '${VALA_MESON_DISABLE_FLAG}', d)} "
+VALAMESONBUILD = "-D${VALA_MESON_OPTION}=${VALA_MESON_DISABLE_FLAG} "
+
+EXTRA_OECONF:prepend:class-target = "${@bb.utils.contains('VALA_ENABLED',
'True', '--enable-vala', '--disable-vala', d)} "
+EXTRA_OEMESON:prepend:class-target = "${@['',
'${VALAMESONTARGET}'][d.getVar('VALA_MESON_OPTION') != '']} "
+# When building native recipes, disable vala, as it is not necessary,
+# pulls in additional dependencies, and makes build times longer
+EXTRA_OECONF:prepend:class-native = "--disable-vala "
+EXTRA_OEMESON:prepend:class-native = "${@['',
'${VALAMESONBUILD}'][d.getVar('VALA_MESON_OPTION') != '']}"
+EXTRA_OECONF:prepend:class-nativesdk = "--disable-vala "
+EXTRA_OEMESON:prepend:class-nativesdk = "${@['',
'${VALAMESONBUILD}'][d.getVar('VALA_MESON_OPTION') != '']}"
+
# Package additional files
FILES:${PN}-dev += "\
${datadir}/vala/vapi/*.vapi \
diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb
b/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb
index 49ebc818b0..e561bfa22a 100644
--- a/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb
+++ b/meta/recipes-gnome/libdazzle/libdazzle_3.44.0.bb
@@ -15,5 +15,6 @@ DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
SRC_URI[archive.sha256sum] =
"3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae"
GIR_MESON_OPTION = 'with_introspection'
+VALA_MESON_OPTION = "with_vapi"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/meta/recipes-support/appstream/appstream_0.16.3.bb
b/meta/recipes-support/appstream/appstream_0.16.3.bb
index bde679e256..dafeff2555 100644
--- a/meta/recipes-support/appstream/appstream_0.16.3.bb
+++ b/meta/recipes-support/appstream/appstream_0.16.3.bb
@@ -40,6 +40,4 @@ PACKAGECONFIG[stemming] =
"-Dstemming=true,-Dstemming=false,libstemmer"
FILES:${PN} += "${datadir}"
-EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'-Dvapi=true', '-Dvapi=false', d)}"
-
BBCLASSEXTEND = "native"
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190261):
https://lists.openembedded.org/g/openembedded-core/message/190261
Mute This Topic: https://lists.openembedded.org/mt/102439967/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
