]> code.ossystems Code Review - openembedded-core.git/commitdiff
vala.bbclass: add libdir to XDG_DATA_DIRS
authorChangqing Li <changqing.li@windriver.com>
Thu, 26 Mar 2020 05:18:18 +0000 (13:18 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 28 Mar 2020 10:24:40 +0000 (10:24 +0000)
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 <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/vala.bbclass

index 615eb379adc96c2732f61b92092d23fe07c12028..bcaf68c5a788ac2e71b7fb3b2806318e6a09219a 100644 (file)
@@ -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 += "\