mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
vala: Fix install conflict when enable multilib.
Error: Transaction test error:
file /usr/bin/vala-gen-introspect-0.56 conflicts between attempted installs of lib32-vala-0.56.3-r0.armv7ahf_neon and vala-0.56.3-r0.aarch64
file /usr/bin/vapigen-wrapper conflicts between attempted installs
of lib32-vala-0.56.3-r0.armv7ahf_neon and vala-0.56.3-r0.aarch64
The differences of vala-gen-introspect-0.56 are as follows:
@@ -2,7 +2,7 @@
prefix=/usr
exec_prefix=/usr
-libdir=/usr/lib64
+libdir=/usr/lib
pkglibdir=${libdir}/vala-0.56
if [ $# -ne 2 ]
The wrapper isn't used on target so we can simply delete it.
(From OE-Core rev: 21e8a662e6232e7fdd642b1d86d4f8f980be1a09)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3cf894b8a9c4fa14fcc7c7445e85e9ae3192b398)
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
77e6375b6e
commit
d5a0300902
@@ -50,6 +50,9 @@ do_install:append:class-target() {
|
||||
# vapi files.
|
||||
SYSROOT_DIRS += "${bindir_crossscripts}"
|
||||
|
||||
inherit multilib_script
|
||||
MULTILIB_SCRIPTS = "${PN}:${bindir}/vala-gen-introspect-0.56"
|
||||
|
||||
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
|
||||
@@ -64,5 +67,5 @@ SSTATE_SCAN_FILES += "vapigen-wrapper"
|
||||
PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess"
|
||||
|
||||
vala_package_preprocess () {
|
||||
sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir_crossscripts}/vapigen-wrapper
|
||||
rm -rf ${PKGD}${bindir_crossscripts}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user