From: Changqing Li Date: Thu, 26 Mar 2020 05:18:18 +0000 (+0800) Subject: vala.bbclass: add libdir to XDG_DATA_DIRS X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~11455 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88f0590b4606d8adc8d728086a22325c1ae56b1;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git vala.bbclass: add libdir to XDG_DATA_DIRS Otherwise .gir files installed in the sysroot will not be found when multilib is in use. for vapigen, it need to find .vapi and .gir files under XDG_DATA_DIRS, for gobject-introspection, multilib configurations use libdir rather than datadir Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- diff --git a/meta/classes/vala.bbclass b/meta/classes/vala.bbclass index 615eb379adc..bcaf68c5a78 100644 --- a/meta/classes/vala.bbclass +++ b/meta/classes/vala.bbclass @@ -8,7 +8,7 @@ DEPENDS_append = " vala-native ${VALADEPENDS}" # Our patched version of Vala looks in STAGING_DATADIR for .vapi files export STAGING_DATADIR # Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files -export XDG_DATA_DIRS = "${STAGING_DATADIR}" +export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}" # Package additional files FILES_${PN}-dev += "\