From e7bf8b6cb2eac640e1f71ef08eb9398e7df661d4 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 14 Aug 2020 14:15:57 +0800 Subject: mozjs: fix multilib conflict fix error: .do_rootfs.2023872:4562: file /usr/bin/js60-config conflicts between attempted installs of mozjs-dev-60.9.0-r0.core2_64 and lib32-mozjs-dev-60.9.0-r0.core2_32 log.do_rootfs.2023872:4563: file /usr/include/mozjs-60/js-config.h conflicts between attempted installs of mozjs-dev-60.9.0-r0.core2_64 and lib32-mozjs-dev-60.9.0-r0.core2_32 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb index 629c6524e8..130ff13ec1 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -119,6 +119,14 @@ do_install_prepend() { export PYTHONPATH=`cat ${B}/PYTHONPATH` } +inherit multilib_script multilib_header + +MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config" + +do_install_append() { + oe_multilib_header mozjs-60/js-config.h +} + PACKAGES =+ "lib${BPN}" FILES_lib${BPN} += "${libdir}/lib*.so" FILES_${PN}-dev += "${bindir}/js60-config" -- cgit 1.2.3-korg