summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-02-05 16:26:29 +0800
committerKhem Raj <raj.khem@gmail.com>2025-02-05 13:56:32 -0800
commit110992d5109924e67bf2087085c7bd019a08c042 (patch)
treecab0731d354a7252a0e9b6f9e086590cc71cd775
parent766281a238903e21b482663483bf32e082549ee0 (diff)
downloadmeta-openembedded-110992d5109924e67bf2087085c7bd019a08c042.tar.gz
gjs: Fix install conflict when enable multilib.
Error: Transaction test error: file /usr/libexec/installed-tests/gjs/GIMarshallingTests-1.0.typelib conflicts between attempted installs of lib32-gjs-1.82.1-r0.core2_32 and gjs-1.82.1-r0.core2_64 file /usr/libexec/installed-tests/gjs/Regress-1.0.typelib conflicts between attempted installs of lib32-gjs-1.82.1-r0.core2_32 and gjs-1.82.1-r0.core2_64 file /usr/libexec/installed-tests/gjs/Utility-1.0.typelib conflicts between attempted installs of lib32-gjs-1.82.1-r0.core2_32 and gjs-1.82.1-r0.core2_64 file /usr/libexec/installed-tests/gjs/WarnLib-1.0.typelib conflicts between attempted installs of lib32-gjs-1.82.1-r0.core2_32 and gjs-1.82.1-r0.core2_64 The .typelib file is a binary file that contains runtime information for the GObject type system. These information include function signature, type size, alignment, etc., which may vary depending on the architecture (32-bit vs 64 bit). Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb
index 55af04e4a5..fd4e9c6f8a 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
5 5
6DEPENDS = "mozjs-128 cairo" 6DEPENDS = "mozjs-128 cairo"
7 7
8inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig 8inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
9 9
10SRC_URI[archive.sha256sum] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c" 10SRC_URI[archive.sha256sum] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c"
11SRC_URI += " \ 11SRC_URI += " \
@@ -37,3 +37,9 @@ RDEPENDS:${PN}-valgrind += "valgrind"
37# Valgrind not yet available on rv32/rv64 37# Valgrind not yet available on rv32/rv64
38RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind" 38RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind"
39RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind" 39RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind"
40
41MULTILIB_SCRIPTS:append = "${PN}:${libexecdir}/installed-tests/gjs/GIMarshallingTests-1.0.typelib \
42 ${PN}:${libexecdir}/installed-tests/gjs/Regress-1.0.typelib \
43 ${PN}:${libexecdir}/installed-tests/gjs/Utility-1.0.typelib \
44 ${PN}:${libexecdir}/installed-tests/gjs/WarnLib-1.0.typelib \
45 "