summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Kubizňák <kubiznak@2n.com>2023-02-17 08:47:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-17 18:01:01 +0000
commit6d5c1129ae464e15e3ba17df7606291bcb94067d (patch)
tree8a30d67b847e2ad5d5dce87ea4e82ca4dab689ee
parent9f2def381105b7829a36d1f068d7bc4dec1aee01 (diff)
downloadpoky-6d5c1129ae464e15e3ba17df7606291bcb94067d.tar.gz
graphene: remove introspection from PACKAGECONFIG
Assignment of "introspection" as default PACKAGECONFIG value does not reflect gobject-introspection being globally enabled or disabled. As a result, graphene compilation used to fail when g-i was disabled. Use standard means to enable or disable introspection based on machine and distro features, as implemented by gobject-introspection class. (From OE-Core rev: a5e22ba9d7b82126c53ad373fa59267c870f7d6b) Signed-off-by: Petr Kubizňák <kubiznak@2n.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/graphene/graphene_1.10.8.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-graphics/graphene/graphene_1.10.8.bb b/meta/recipes-graphics/graphene/graphene_1.10.8.bb
index 75c8258d99..120ee80b17 100644
--- a/meta/recipes-graphics/graphene/graphene_1.10.8.bb
+++ b/meta/recipes-graphics/graphene/graphene_1.10.8.bb
@@ -9,14 +9,15 @@ inherit gnomebase gobject-introspection gtk-doc
9 9
10SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a" 10SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a"
11 11
12# gtk4 & mutter 41.0 requires graphene build with introspection
13# Disable neon support by default on ARM-32 platforms because of the 12# Disable neon support by default on ARM-32 platforms because of the
14# following upstream bug: https://github.com/ebassi/graphene/issues/215 13# following upstream bug: https://github.com/ebassi/graphene/issues/215
15PACKAGECONFIG ?= "introspection ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}" 14PACKAGECONFIG ?= "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
16 15
17PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled,"
18PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false," 16PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false,"
19 17
18GIR_MESON_ENABLE_FLAG = 'enabled'
19GIR_MESON_DISABLE_FLAG = 'disabled'
20
20GTKDOC_MESON_OPTION = "gtk_doc" 21GTKDOC_MESON_OPTION = "gtk_doc"
21 22
22EXTRA_OEMESON = "-Dinstalled_tests=false" 23EXTRA_OEMESON = "-Dinstalled_tests=false"