diff options
| -rw-r--r-- | meta/recipes-devtools/vala/vala.inc | 13 |
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. | ||
| 41 | SYSROOT_DIRS_append_class-target = " ${bindir}" | ||
| 39 | 42 | ||
| 40 | SYSROOT_PREPROCESS_FUNCS_append_class-target += "vapigen_sysroot_preprocess" | 43 | SYSROOT_PREPROCESS_FUNCS_append_class-target = " vapigen_sysroot_preprocess" |
| 41 | |||
| 42 | vapigen_sysroot_preprocess() { | 44 | vapigen_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 |
