mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-08 03:49:57 +00:00
Code Issues Projects Releases Wiki Activity

mozjs: fix multilib conflict

Browse Source 
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>
This commit is contained in:
Changqing Li
2020-08-14 14:15:57 +08:00
committed by Khem Raj
parent 4e42fe5519
commit e7bf8b6cb2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb
+8
View File
@@ -119,6 +119,14 @@ do_install_prepend() {
export PYTHONPATH=`cat ${B}/PYTHONPATH` 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}" PACKAGES =+ "lib${BPN}"
FILES_lib${BPN} += "${libdir}/lib*.so" FILES_lib${BPN} += "${libdir}/lib*.so"
FILES_${PN}-dev += "${bindir}/js60-config" FILES_${PN}-dev += "${bindir}/js60-config"