diff options
| -rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb | 7 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb index 38e4128d6a..3a7b51c145 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb | |||
| @@ -66,12 +66,13 @@ do_install() { | |||
| 66 | 66 | ||
| 67 | inherit multilib_script multilib_header | 67 | inherit multilib_script multilib_header |
| 68 | 68 | ||
| 69 | MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config" | 69 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" |
| 70 | MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" | ||
| 70 | 71 | ||
| 71 | do_install:append() { | 72 | do_install:append() { |
| 72 | oe_multilib_header mozjs-102/js-config.h | 73 | oe_multilib_header mozjs-${MAJ_VER}/js-config.h |
| 73 | sed -e 's@${STAGING_DIR_HOST}@@g' \ | 74 | sed -e 's@${STAGING_DIR_HOST}@@g' \ |
| 74 | -i ${D}${bindir}/js102-config | 75 | -i ${D}${bindir}/js${MAJ_VER}-config |
| 75 | rm -f ${D}${libdir}/libjs_static.ajs | 76 | rm -f ${D}${libdir}/libjs_static.ajs |
| 76 | # remove the build path | 77 | # remove the build path |
| 77 | sed -i -e 's@${WORKDIR}@@g' `find ${B} -name Unified_c*.c*` | 78 | sed -i -e 's@${WORKDIR}@@g' `find ${B} -name Unified_c*.c*` |
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb index b029c5f4ec..fcdf64c932 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb | |||
| @@ -66,12 +66,13 @@ do_install() { | |||
| 66 | 66 | ||
| 67 | inherit multilib_script multilib_header | 67 | inherit multilib_script multilib_header |
| 68 | 68 | ||
| 69 | MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js115-config" | 69 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" |
| 70 | MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" | ||
| 70 | 71 | ||
| 71 | do_install:append() { | 72 | do_install:append() { |
| 72 | oe_multilib_header mozjs-115/js-config.h | 73 | oe_multilib_header mozjs-${MAJ_VER}/js-config.h |
| 73 | sed -e 's@${STAGING_DIR_HOST}@@g' \ | 74 | sed -e 's@${STAGING_DIR_HOST}@@g' \ |
| 74 | -i ${D}${bindir}/js115-config | 75 | -i ${D}${bindir}/js${MAJ_VER}-config |
| 75 | rm -f ${D}${libdir}/libjs_static.ajs | 76 | rm -f ${D}${libdir}/libjs_static.ajs |
| 76 | } | 77 | } |
| 77 | 78 | ||
