From c70f093fd26cc391991423d8b4c305693a97b883 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 8 Mar 2023 09:40:17 +0800 Subject: 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: 3cf894b8a9c4fa14fcc7c7445e85e9ae3192b398) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/vala/vala.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index d3daee37dc..162e99bb03 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -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} } -- cgit v1.2.3-54-g00ecf