From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 24 Feb 2023 09:40:18 +0000 (+0100)
Subject: gcr: correctly configure vala against introspection data
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1578
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b32bb078d73ab9fd636d059cf70b5530a2f94cb4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

gcr: correctly configure vala against introspection data

GI_DATA_ENABLED is the right source for making that decision
as it additionally factors in presence of qemu-usermode in
MACHINE_FEATURES.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-gnome/gcr/gcr_4.0.0.bb b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
index b1379689437..7821e31b523 100644
--- a/meta/recipes-gnome/gcr/gcr_4.0.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
@@ -29,7 +29,7 @@ PACKAGECONFIG ??= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 	${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
 	${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
-	${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vapi', '', d)} \
+	${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} \
 "
 PACKAGECONFIG[gtk] = "-Dgtk4=true,-Dgtk4=false,gtk4"
 PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh"