summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/vala/vala.inc7
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
24FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" 24FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/"
25FILES_${PN}-doc += "${datadir}/devhelp" 25FILES_${PN}-doc += "${datadir}/devhelp"
26 26
27# .gir files from gobject-introspection are installed to ${libdir} when multilib is enabled
28GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}"
29
27do_configure_prepend_class-target() { 30do_configure_prepend_class-target() {
28 # Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot 31 # Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot
29 # The wrapper will call a native vapigen 32 # The wrapper will call a native vapigen
30 cat > ${B}/vapigen-wrapper << EOF 33 cat > ${B}/vapigen-wrapper << EOF
31#!/bin/sh 34#!/bin/sh
32vapigen-${SHRT_VER} "\$@" 35vapigen-${SHRT_VER} ${GIRDIR_OPT} "\$@"
33EOF 36EOF
34 chmod +x ${B}/vapigen-wrapper 37 chmod +x ${B}/vapigen-wrapper
35} 38}
@@ -55,3 +58,5 @@ vapigen_sysroot_preprocess() {
55 -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \ 58 -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \
56 ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc 59 ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc
57} 60}
61
62SSTATE_SCAN_FILES += "vapigen-wrapper"