On Wed, Mar 17, 2021 at 7:56 PM Yu, Mingli <[email protected]> wrote:
> From: Mingli Yu <[email protected]> > > The below m4 macros files shipped with recipe will be removed if the > recipe use AM_GNU_GETTEXT. > gettext.m4 > iconv.m4 > lib-ld.m4 > lib-link.m4 > lib-prefix.m4 > nls.m4 po.m4 > progtest.m4 > > After elfutils upgrades to 0.183, it begins to use AM_GNU_GETTEXT as the > commit (dd52d2ab Modernize gettext infrastructure) included, so the above > m4 macros files such as iconv.m4 is removed and it's bad as we need to > patch against iconv.m4 shippped with elfutils. > > So we skip elfutils to not let the elfutils m4 macros removed and also > fix below issue: > $ bitbake elfutils -cconfigure && bitbake elfutils -cpatch > > Signed-off-by: Mingli Yu <[email protected]> > --- > meta/classes/autotools.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/autotools.bbclass > b/meta/classes/autotools.bbclass > index 9dc8ebdaa7..4b462c5aba 100644 > --- a/meta/classes/autotools.bbclass > +++ b/meta/classes/autotools.bbclass > @@ -203,7 +203,7 @@ autotools_do_configure() { > bbnote Executing glib-gettextize --force > --copy > echo "no" | glib-gettextize --force --copy > fi > - elif [ "${BPN}" != "gettext" ] && grep -q > "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then > + elif [ "${BPN}" != "gettext" -a "${BPN}" != "elfutils" ] > && grep -q "^[[:space:]]*AM_GNU_GETTEXT" This looks a bit iffy to me where we are moving recipe specific knowledge into a generic class Please find a solution that works in recipe space Perhaps move these macros to different folder before regenerating them and then move back as desired or perhaps look at if the gettext change we did for elfutils is too deep a cut then we might want to revert that $CONFIGURE_AC; then > # We'd call gettextize here if it wasn't so > broken... > cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath > ${AUTOTOOLS_AUXDIR}/ > if [ -d ${S}/po/ ]; then > -- > 2.17.1 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149617): https://lists.openembedded.org/g/openembedded-core/message/149617 Mute This Topic: https://lists.openembedded.org/mt/81421450/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
