summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/vala/vala.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index 974baa33f5..d3daee37dc 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -42,20 +42,20 @@ EXTRA_OECONF += " --disable-valadoc"
42# Vapigen wrapper needs to be available system-wide, because it will be used 42# Vapigen wrapper needs to be available system-wide, because it will be used
43# to build vapi files from all other packages with vala support 43# to build vapi files from all other packages with vala support
44do_install:append:class-target() { 44do_install:append:class-target() {
45 install -d ${D}${bindir}/ 45 install -d ${D}${bindir_crossscripts}/
46 install ${B}/vapigen-wrapper ${D}${bindir}/ 46 install ${B}/vapigen-wrapper ${D}${bindir_crossscripts}/
47} 47}
48 48
49# Put vapigen wrapper into target sysroot so that it can be used when building 49# Put vapigen wrapper into target sysroot so that it can be used when building
50# vapi files. 50# vapi files.
51SYSROOT_DIRS:append:class-target = " ${bindir}" 51SYSROOT_DIRS += "${bindir_crossscripts}"
52 52
53SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess" 53SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess"
54vapigen_sysroot_preprocess() { 54vapigen_sysroot_preprocess() {
55 # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks 55 # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks
56 # up our wrapper. 56 # up our wrapper.
57 sed -i \ 57 sed -i \
58 -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \ 58 -e "s|vapigen=.*|vapigen=${bindir_crossscripts}/vapigen-wrapper|" \
59 ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc 59 ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc
60} 60}
61 61
@@ -64,5 +64,5 @@ SSTATE_SCAN_FILES += "vapigen-wrapper"
64PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess" 64PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess"
65 65
66vala_package_preprocess () { 66vala_package_preprocess () {
67 sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir}/vapigen-wrapper 67 sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir_crossscripts}/vapigen-wrapper
68} 68}