mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
mozjs: use PV in MULTILIB_SCRIPTS
* to avoid possible issue next time new mozjs version recipe is introduced (as multilib isn't as well tested as other build configs) * this depends on oe-core change to expand script name in MULTILIB_SCRIPTS: https://lists.openembedded.org/g/openembedded-core/message/188301 Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -66,12 +66,13 @@ do_install() {
|
||||
|
||||
inherit multilib_script multilib_header
|
||||
|
||||
MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config"
|
||||
MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}"
|
||||
MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config"
|
||||
|
||||
do_install:append() {
|
||||
oe_multilib_header mozjs-102/js-config.h
|
||||
oe_multilib_header mozjs-${MAJ_VER}/js-config.h
|
||||
sed -e 's@${STAGING_DIR_HOST}@@g' \
|
||||
-i ${D}${bindir}/js102-config
|
||||
-i ${D}${bindir}/js${MAJ_VER}-config
|
||||
rm -f ${D}${libdir}/libjs_static.ajs
|
||||
# remove the build path
|
||||
sed -i -e 's@${WORKDIR}@@g' `find ${B} -name Unified_c*.c*`
|
||||
|
||||
@@ -66,12 +66,13 @@ do_install() {
|
||||
|
||||
inherit multilib_script multilib_header
|
||||
|
||||
MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js115-config"
|
||||
MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}"
|
||||
MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config"
|
||||
|
||||
do_install:append() {
|
||||
oe_multilib_header mozjs-115/js-config.h
|
||||
oe_multilib_header mozjs-${MAJ_VER}/js-config.h
|
||||
sed -e 's@${STAGING_DIR_HOST}@@g' \
|
||||
-i ${D}${bindir}/js115-config
|
||||
-i ${D}${bindir}/js${MAJ_VER}-config
|
||||
rm -f ${D}${libdir}/libjs_static.ajs
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user