summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/vala/vala.inc
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:41:27 +0100
commitdf0299431bb047e9357c62cc6d446ee145906d29 (patch)
treed0f0430837781b1c14d669aa00febcb90849e0da /meta/recipes-devtools/vala/vala.inc
parent700ce6b5e31eba3d528d15225d26916f519d62c8 (diff)
downloadpoky-df0299431bb047e9357c62cc6d446ee145906d29.tar.gz
vala.inc: Use SYSROOT_DIRS to add dirs to stage in sysroot
(From OE-Core rev: 0ff68e3a3a8e10f7f3972305e619c087f758e5b6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/vala/vala.inc')
-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() {
36 install ${B}/vapigen-wrapper ${D}${bindir}/ 36 install ${B}/vapigen-wrapper ${D}${bindir}/
37} 37}
38 38
39# Put vapigen wrapper into target sysroot so that it can be used when building
40# vapi files.
41SYSROOT_DIRS_append_class-target = " ${bindir}"
39 42
40SYSROOT_PREPROCESS_FUNCS_append_class-target += "vapigen_sysroot_preprocess" 43SYSROOT_PREPROCESS_FUNCS_append_class-target = " vapigen_sysroot_preprocess"
41
42vapigen_sysroot_preprocess() { 44vapigen_sysroot_preprocess() {
43 # Put vapigen wrapper into target sysroot so that it can be used when building vapi files. 45 # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks
44 sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir} 46 # up our wrapper.
45
46 # Also, tweak the vapigen name in vapigen pkgconfig file, so that it picks up our
47 # wrapper.
48 sed -i \ 47 sed -i \
49 -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \ 48 -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \
50 ${SYSROOT_DESTDIR}${datadir}/pkgconfig/vapigen-${SHRT_VER}.pc 49 ${SYSROOT_DESTDIR}${datadir}/pkgconfig/vapigen-${SHRT_VER}.pc