summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/vala
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-05-12 10:37:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:40:49 +0100
commit0ff68e3a3a8e10f7f3972305e619c087f758e5b6 (patch)
tree9f38f1063b30239f5fccd7f1ba781aebdbc57cd6 /meta/recipes-devtools/vala
parent4a37960e504d6c0bbd0f4c088bef8f3a99beab6a (diff)
downloadopenembedded-core-0ff68e3a3a8e10f7f3972305e619c087f758e5b6.tar.gz
openembedded-core-0ff68e3a3a8e10f7f3972305e619c087f758e5b6.tar.bz2
openembedded-core-0ff68e3a3a8e10f7f3972305e619c087f758e5b6.zip
vala.inc: Use SYSROOT_DIRS to add dirs to stage in sysroot
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/vala')
-rw-r--r--meta/recipes-devtools/vala/vala.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index 2a8875f011..37aa38f542 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -36,15 +36,14 @@ do_install_append_class-target() {
install ${B}/vapigen-wrapper ${D}${bindir}/
}
+# Put vapigen wrapper into target sysroot so that it can be used when building
+# vapi files.
+SYSROOT_DIRS_append_class-target = " ${bindir}"
-SYSROOT_PREPROCESS_FUNCS_append_class-target += "vapigen_sysroot_preprocess"
-
+SYSROOT_PREPROCESS_FUNCS_append_class-target = " vapigen_sysroot_preprocess"
vapigen_sysroot_preprocess() {
- # Put vapigen wrapper into target sysroot so that it can be used when building vapi files.
- sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
-
- # Also, tweak the vapigen name in vapigen pkgconfig file, so that it picks up our
- # wrapper.
+ # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks
+ # up our wrapper.
sed -i \
-e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \
${SYSROOT_DESTDIR}${datadir}/pkgconfig/vapigen-${SHRT_VER}.pc