From 110992d5109924e67bf2087085c7bd019a08c042 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 5 Feb 2025 16:26:29 +0800 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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" DEPENDS = "mozjs-128 cairo" -inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig +inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script SRC_URI[archive.sha256sum] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c" SRC_URI += " \ @@ -37,3 +37,9 @@ RDEPENDS:${PN}-valgrind += "valgrind" # Valgrind not yet available on rv32/rv64 RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind" RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind" + +MULTILIB_SCRIPTS:append = "${PN}:${libexecdir}/installed-tests/gjs/GIMarshallingTests-1.0.typelib \ + ${PN}:${libexecdir}/installed-tests/gjs/Regress-1.0.typelib \ + ${PN}:${libexecdir}/installed-tests/gjs/Utility-1.0.typelib \ + ${PN}:${libexecdir}/installed-tests/gjs/WarnLib-1.0.typelib \ + "