diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-03-08 09:40:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-08 16:41:55 +0000 |
commit | c70f093fd26cc391991423d8b4c305693a97b883 (patch) | |
tree | add8cdbb51b5ee90ed8908cfe650fcf7e30e855f | |
parent | 59972136638c6348c793458981711c8d5f96f8ae (diff) | |
download | poky-c70f093fd26cc391991423d8b4c305693a97b883.tar.gz |
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 <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/vala/vala.inc | 5 |
1 files changed, 4 insertions, 1 deletions
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() { | |||
50 | # vapi files. | 50 | # vapi files. |
51 | SYSROOT_DIRS += "${bindir_crossscripts}" | 51 | SYSROOT_DIRS += "${bindir_crossscripts}" |
52 | 52 | ||
53 | inherit multilib_script | ||
54 | MULTILIB_SCRIPTS = "${PN}:${bindir}/vala-gen-introspect-0.56" | ||
55 | |||
53 | SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess" | 56 | SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess" |
54 | vapigen_sysroot_preprocess() { | 57 | vapigen_sysroot_preprocess() { |
55 | # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks | 58 | # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks |
@@ -64,5 +67,5 @@ SSTATE_SCAN_FILES += "vapigen-wrapper" | |||
64 | PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess" | 67 | PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess" |
65 | 68 | ||
66 | vala_package_preprocess () { | 69 | vala_package_preprocess () { |
67 | sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir_crossscripts}/vapigen-wrapper | 70 | rm -rf ${PKGD}${bindir_crossscripts} |
68 | } | 71 | } |