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 <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 8 insertions, 0 deletions

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 629c6524e..130ff13ec 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"