diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2020-08-14 14:15:57 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-08-14 06:51:01 -0700 |
| commit | e7bf8b6cb2eac640e1f71ef08eb9398e7df661d4 (patch) | |
| tree | e31521186a055718aa257d190e7ebfe7a67b388a | |
| parent | 4e42fe5519207974373873f5a620deebb70f02c3 (diff) | |
| download | meta-openembedded-contrib-e7bf8b6cb2eac640e1f71ef08eb9398e7df661d4.tar.gz | |
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>
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb | 8 |
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 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" |