From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by mx.groups.io with SMTP id smtpd.web10.4523.1616039590541024856 for ; Wed, 17 Mar 2021 20:53:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=c5H9MXEC; spf=pass (domain: gmail.com, ip: 209.85.222.176, mailfrom: raj.khem@gmail.com) Received: by mail-qk1-f176.google.com with SMTP id l4so796550qkl.0 for ; Wed, 17 Mar 2021 20:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QB3rmPJ1g1DK0nBpE9N4CFvMG1Upp9S4ukSafT/To5A=; b=c5H9MXECwapqndLb3ub+ALXiXOOuZjAetTEmegaFxaRzay+d/j3vJLwUPnS8DSlGlb xpjnwuPjkt4N0rVby9hYcz0khHD7LkWqJrTXHthipF4pCEjk3NAiwpyEXmXlzy55/Mxu fsvxhVHGNB5crVL4LIZL0ug1Ruoj+idcjBOuMfoRnW0mtOMMe8PWc0JzG7m+SnbdF+4R lep/ZyyLRV8lmJiQGvJtA5LArA8WS035UKhMwMgHUaaE3LKUVekejm8ehHw8AlqDrt6j Jy6Ij0lm/Th4cZdea+s2tSXfRY6CMwPcegHmi4fTbTw7I5DrqsN7Fljl47FGFcbZNNlw KEVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QB3rmPJ1g1DK0nBpE9N4CFvMG1Upp9S4ukSafT/To5A=; b=WbyNDBuu+dv0V8fRfa50hH1UiDwsFBR2zOvUaJpuykzZPLhnWfkAr7rRpTpzX4GcsQ zO0I6fB2JAoFhn8wv5zIkrqKkCGRX5oKe6ma5t/J5Cf5/wWQY91w8Xah2x/pxV8+tG8k RaJwCendr519CXjDhZHADsLVuP9x8UaC44gQ+1U46101Al87IHkNojcTuNrP1/N2bBVJ JuciU9swoyCeROX8FTB9QX+MJGY//hbzW841Ii3/RuGMqWAL/eAbQaJHShZ15UQW6O6K DmGEoD8jBo3pp7lHoRxp8fFiammMM1LUAcbf8D/85gvJbwSuZZCAKZM3ZsgQXotdVdSL N7FA== X-Gm-Message-State: AOAM530CeUX2IsZMwAbiXRTVqtS6SehCCvxnAX1rUQJ9EncelaGkL1bk qaK6ywCAhVp3sjJ/u7JXy0jhfcE4vGTc22+ESDA= X-Google-Smtp-Source: ABdhPJx17WLe304aeZaUGQCVyjLTzhQ0qyEhfABC6s8OfjjE6UfS5souQSg75qZY4zEYGoMtbcgvhQEWOF9tBdi98aY= X-Received: by 2002:a05:620a:124f:: with SMTP id a15mr2544478qkl.125.1616039589442; Wed, 17 Mar 2021 20:53:09 -0700 (PDT) MIME-Version: 1.0 References: <20210318025605.48080-1-mingli.yu@windriver.com> In-Reply-To: <20210318025605.48080-1-mingli.yu@windriver.com> From: "Khem Raj" Date: Wed, 17 Mar 2021 20:52:56 -0700 Message-ID: Subject: Re: [OE-core] [PATCH] autotools: don't wipe elfutils macros To: "Yu, Mingli" Cc: openembedded-core@lists.openembedded.org Content-Type: multipart/alternative; boundary="000000000000abf97805bdc789c2" --000000000000abf97805bdc789c2 Content-Type: text/plain; charset="UTF-8" On Wed, Mar 17, 2021 at 7:56 PM Yu, Mingli wrote: > From: Mingli Yu > > 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 > --- > 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 > > > > > --000000000000abf97805bdc789c2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Mar 17, 2021 at 7:56 PM Yu, Mingli <mingli.yu@windriver.com> wrote:
<= /div>
From: Mingli Yu <mingli.yu@windriver.com>

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<= br> 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:
=C2=A0$ bitbake elfutils -cconfigure && bitbake elfutils -cpatch
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
=C2=A0meta/classes/autotools.bbclass | 2 +-
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbcla= ss
index 9dc8ebdaa7..4b462c5aba 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -203,7 +203,7 @@ autotools_do_configure() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bbnote Executing glib-gettextize --= force --copy
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "no" | glib-gettexti= ze --force --copy
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 fi
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0elif [ "${BPN= }" !=3D "gettext" ] && grep -q "^[[:space:]]*AM= _GNU_GETTEXT" $CONFIGURE_AC; then
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0elif [ "${BPN= }" !=3D "gettext" -a "${BPN}" !=3D "elfutils&= quot; ] && grep -q "^[[:space:]]*AM_GNU_GETTEXT"


This looks a bit iffy to me where we are moving recipe specific knowled= ge into a generic class

= Please find a solution that works in recipe space
Pe= rhaps move these macros to different folder before regenerating them and th= en 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=C2=A0

$CONFIGURE_AC; then=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 # We'd call gettextize here if it wasn't so broken... =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_A= UXDIR}/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 if [ -d ${S}/po/ ]; then
--
2.17.1




--000000000000abf97805bdc789c2--