| Message ID | 20230927104920.2052173-4-martin.jansa@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,1/4] gnome-tweaks, networkmanager-fortisslvpn, libesmtp, json-schema-validator, python3-pybluez, python3-pynetlinux, apache2: Fix Malformed Upstream-Status | expand |
Can you rebase on master-next and resend. On Wed, Sep 27, 2023 at 3:49 AM Martin Jansa <martin.jansa@gmail.com> wrote: > > * 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> > --- > meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb | 7 ++++--- > 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.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb > index 08cfededa7..f2781d7096 100644 > --- a/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb > +++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb > @@ -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 > } > > 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() { > > 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 > } > > -- > 2.42.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#105189): https://lists.openembedded.org/g/openembedded-devel/message/105189 > Mute This Topic: https://lists.openembedded.org/mt/101614706/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb index 08cfededa7..f2781d7096 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb @@ -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 } 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() { 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 }
* 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> --- meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb | 7 ++++--- meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-)