From: Wang Mingyu <[email protected]> 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
Signed-off-by: Wang Mingyu <[email protected]> --- meta/recipes-devtools/vala/vala.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index d3daee37dc..5f4d4ceb70 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -42,14 +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_crossscripts}/ - install ${B}/vapigen-wrapper ${D}${bindir_crossscripts}/ + install -d ${D}${bindir_crossscripts} + install ${B}/vapigen-wrapper ${D}${bindir_crossscripts} + install ${B}/vapigen-wrapper ${D}${libdir} } +FILES:${PN}-dev += "${libdir}/vapigen-wrapper" + # Put vapigen wrapper into target sysroot so that it can be used when building # 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 @@ -65,4 +71,5 @@ 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} } -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178087): https://lists.openembedded.org/g/openembedded-core/message/178087 Mute This Topic: https://lists.openembedded.org/mt/97444248/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
