From: Peter Kjellerstedt Date: Thu, 12 May 2016 08:37:57 +0000 (+0200) Subject: vala.inc: Use SYSROOT_DIRS to add dirs to stage in sysroot X-Git-Tag: yocto-4.0~21469 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ff68e3a3a8e10f7f3972305e619c087f758e5b6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git vala.inc: Use SYSROOT_DIRS to add dirs to stage in sysroot Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index 2a8875f0111..37aa38f5425 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