]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
vala: Fix install conflict when enable multilib.
authorWang Mingyu <wangmy@fujitsu.com>
Wed, 8 Mar 2023 01:40:17 +0000 (09:40 +0800)
committerSteve Sakoman <steve@sakoman.com>
Tue, 14 Mar 2023 15:40:43 +0000 (05:40 -1000)
commit8b41b5d2e423636942e34723ad940f6f143640c9
treeb0aec4b803e7dc9a6acd3936232b52fa4da5284b
parentb2892b3b6fa1d396f845539c0256ca0f71378b94
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.

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>
meta/recipes-devtools/vala/vala.inc