mirror of
https://git.yoctoproject.org/poky
synced 2026-04-13 14:02:21 +02:00
vala: install vapigen-wrapper into /usr/bin/crosscripts and stage only that
Staging the whole /usr/bin is not correct, as it pulls in also all the vala's cross binaries, which may be discovered by other recipes and things will go wrong then. (From OE-Core rev: 0de07deebc3b8d39b47e7130b8e096e74c8ef767) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 52629d9db0344146ff4734632b17bd731e247fd5) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3217d20246
commit
509f2f8100
@@ -42,20 +42,20 @@ EXTRA_OECONF += " --disable-valadoc"
|
||||
# Vapigen wrapper needs to be available system-wide, because it will be used
|
||||
# to build vapi files from all other packages with vala support
|
||||
do_install:append:class-target() {
|
||||
install -d ${D}${bindir}/
|
||||
install ${B}/vapigen-wrapper ${D}${bindir}/
|
||||
install -d ${D}${bindir_crossscripts}/
|
||||
install ${B}/vapigen-wrapper ${D}${bindir_crossscripts}/
|
||||
}
|
||||
|
||||
# Put vapigen wrapper into target sysroot so that it can be used when building
|
||||
# vapi files.
|
||||
SYSROOT_DIRS:append:class-target = " ${bindir}"
|
||||
SYSROOT_DIRS += "${bindir_crossscripts}"
|
||||
|
||||
SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess"
|
||||
vapigen_sysroot_preprocess() {
|
||||
# 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|" \
|
||||
-e "s|vapigen=.*|vapigen=${bindir_crossscripts}/vapigen-wrapper|" \
|
||||
${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc
|
||||
}
|
||||
|
||||
@@ -64,5 +64,5 @@ SSTATE_SCAN_FILES += "vapigen-wrapper"
|
||||
PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess"
|
||||
|
||||
vala_package_preprocess () {
|
||||
sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir}/vapigen-wrapper
|
||||
sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir_crossscripts}/vapigen-wrapper
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user