diff options
| author | Kai Kang <kai.kang@windriver.com> | 2018-10-10 23:03:01 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-12 08:44:05 +0100 |
| commit | 78df4225cc12ba59466ae398b3860b207758e652 (patch) | |
| tree | b940bee667b3149bace45afa844082e6da5e97d2 | |
| parent | efd91da5230ea27f5c554c3fe51d4c009b85705d (diff) | |
| download | openembedded-core-78df4225cc12ba59466ae398b3860b207758e652.tar.gz openembedded-core-78df4225cc12ba59466ae398b3860b207758e652.tar.bz2 openembedded-core-78df4225cc12ba59466ae398b3860b207758e652.zip | |
vala: update vapigen-wrapper
The .gir files from gobject-introspection are configured to install to
${libdir}/gir-1.0 when multilib is enabled. Update vapigen-wrapper accordingly.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/vala/vala.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index b22faad780..f680640ca6 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -24,12 +24,15 @@ inherit autotools pkgconfig upstream-version-is-even FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" FILES_${PN}-doc += "${datadir}/devhelp" +# .gir files from gobject-introspection are installed to ${libdir} when multilib is enabled +GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}" + do_configure_prepend_class-target() { # Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot # The wrapper will call a native vapigen cat > ${B}/vapigen-wrapper << EOF #!/bin/sh -vapigen-${SHRT_VER} "\$@" +vapigen-${SHRT_VER} ${GIRDIR_OPT} "\$@" EOF chmod +x ${B}/vapigen-wrapper } @@ -55,3 +58,5 @@ vapigen_sysroot_preprocess() { -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \ ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc } + +SSTATE_SCAN_FILES += "vapigen-wrapper" |