mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
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>
This commit is contained in:
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
|
|||||||
|
|
||||||
DEPENDS = "mozjs-128 cairo"
|
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[archive.sha256sum] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c"
|
||||||
SRC_URI += " \
|
SRC_URI += " \
|
||||||
@@ -37,3 +37,9 @@ RDEPENDS:${PN}-valgrind += "valgrind"
|
|||||||
# Valgrind not yet available on rv32/rv64
|
# Valgrind not yet available on rv32/rv64
|
||||||
RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind"
|
RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind"
|
||||||
RDEPENDS:${PN}-valgrind:remove:riscv64 = "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 \
|
||||||
|
"
|
||||||
|
|||||||
Reference in New Issue
Block a user