Skip to contentSkip to conversation

autotools: don't wipe elfutils macros

PATCH New Yu, Mingli 3 participants 7 messages Mar 18, 2021 2 messages not in the archive

lore
Share & tools
lore

Yu, Mingli

author
#1 lore raw

PATCH v2 1/1 autotools: don't wipe elfutils macros

In reply to a message not in the archive

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 -f
---
 meta/classes/autotools.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/autotools.bbclass +1 -1
index 9dc8ebdaa7..4b462c5aba 100644
@@ -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" $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
Signature · 1 line
2.17.1
author
#3 lore raw
In reply to a message not in the archive

Hi Khem,

Understood your concern, but skip elfutils here is the least code change and the gettext also use this means previously.

Meanwhile, there should as least as possible recipe need to skip wiping macros. If no, we may need to reconsider the related implement in autotools.bbclass. From this perspective, I think we should better record the recipe in this general bbclass.

Thanks,

Quoted 44 lines · Mingli

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 -f
---
  meta/classes/autotools.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/autotools.bbclass +1 -1
index 9dc8ebdaa7..4b462c5aba 100644
@@ -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" $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
#4 lore raw
Quoted 5 lines · Mingli

Hi Khem,

Understood your concern, but skip elfutils here is the least code change and the gettext also use this means previously.

gettext perhaps can be pardoned since its the one providing these macros in first place.

Quoted 5 lines

Meanwhile, there should as least as possible recipe need to skip wiping macros. If no, we may need to reconsider the related implement in autotools.bbclass. From this perspective, I think we should better record the recipe in this general bbclass.

I agree, but so far it seems its only elfutils, if there are more then please mentioned then to the list
and perhaps a different solution should be sought.

Quoted 48 lines

Thanks,

Quoted 44 lines · Mingli

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 -f
---
  meta/classes/autotools.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/autotools.bbclass +1 -1
index 9dc8ebdaa7..4b462c5aba 100644
@@ -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" $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
author
#5 lore raw
Quoted 13 lines · Khem Raj

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 5 lines · Mingli

Hi Khem,

Understood your concern, but skip elfutils here is the least code change and the gettext also use this means previously.

gettext perhaps can be pardoned since its the one providing these macros in first place.

Quoted 1 line
Quoted 8 lines
Quoted 4 lines

Meanwhile, there should as least as possible recipe need to skip wiping macros. If no, we may need to reconsider the related implement in autotools.bbclass. From this perspective, I think we should better record the recipe in this general bbclass.

I agree, but so far it seems its only elfutils, if there are more then please mentioned then to the list
and perhaps a different solution should be sought.

Currently only found elfutils has this problem in my env. I think firstly if only one recipe, it's no big deal to record here as we wipe the per recipe macros in this autotools.bbclass(I didn't find other distribution wipe the macros). And secondly if there are other recipes need to skip the wiping, then it's just right to record here to prove we need to reconsider the related implements in autotools.bbclass.

Thanks,

Quoted 53 lines
Quoted 53 lines

Thanks,

Quoted 48 lines · Mingli

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 -f
---
   meta/classes/autotools.bbclass | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/autotools.bbclass +1 -1
index 9dc8ebdaa7..4b462c5aba 100644
@@ -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" $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
#6 lore raw
Quoted 26 lines · Mingli
Quoted 13 lines · Khem Raj

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 5 lines · Mingli

Hi Khem,

Understood your concern, but skip elfutils here is the least code change and the gettext also use this means previously.

gettext perhaps can be pardoned since its the one providing these macros in first place.

Quoted 1 line
Quoted 8 lines
Quoted 4 lines

Meanwhile, there should as least as possible recipe need to skip wiping macros. If no, we may need to reconsider the related implement in autotools.bbclass. From this perspective, I think we should better record the recipe in this general bbclass.

I agree, but so far it seems its only elfutils, if there are more then please mentioned then to the list
and perhaps a different solution should be sought.

Quoted 7 lines

Currently only found elfutils has this problem in my env. I think firstly if only one recipe, it's no big deal to record here as we wipe the per recipe macros in this autotools.bbclass(I didn't find other distribution wipe the macros). And secondly if there are other recipes need to skip the wiping, then it's just right to record here to prove we need to reconsider the related implements in autotools.bbclass.

this class is used everywhere, adding a check in this class would mean its executed in every recipe inehrititng it so no we are not doing it for one recipe.

Quoted 55 lines

Thanks,

Quoted 53 lines
Quoted 53 lines

Thanks,

Quoted 48 lines · Mingli

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 -f
---
   meta/classes/autotools.bbclass | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/autotools.bbclass +1 -1
index 9dc8ebdaa7..4b462c5aba 100644
@@ -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" $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
#7 lore raw
Quoted 35 lines · Khem Raj
Quoted 26 lines · Mingli
Quoted 13 lines · Khem Raj

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 5 lines · Mingli

Hi Khem,

Understood your concern, but skip elfutils here is the least code change and the gettext also use this means previously.

gettext perhaps can be pardoned since its the one providing these macros in first place.

Quoted 1 line
Quoted 8 lines
Quoted 4 lines

Meanwhile, there should as least as possible recipe need to skip wiping macros. If no, we may need to reconsider the related implement in autotools.bbclass. From this perspective, I think we should better record the recipe in this general bbclass.

I agree, but so far it seems its only elfutils, if there are more then please mentioned then to the list
and perhaps a different solution should be sought.

Quoted 7 lines

Currently only found elfutils has this problem in my env. I think firstly if only one recipe, it's no big deal to record here as we wipe the per recipe macros in this autotools.bbclass(I didn't find other distribution wipe the macros). And secondly if there are other recipes need to skip the wiping, then it's just right to record here to prove we need to reconsider the related implements in autotools.bbclass.

Quoted 3 lines

this class is used everywhere, adding a check in this class would mean its executed in every recipe inehrititng it so no we are not doing it for one recipe.

I agree with Ross and Khem, this isn't a good fix. What issue are you seeing with elfutils? We're not seeing anything in our testing...

Cheers,

Richard

author
#8 lore raw
Quoted 38 lines · Richard Purdie

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 35 lines · Khem Raj
Quoted 33 lines · Mingli
Quoted 13 lines · Khem Raj

[Please note: This e-mail is from an EXTERNAL e-mail address]

Quoted 5 lines · Mingli

Hi Khem,

Understood your concern, but skip elfutils here is the least code change and the gettext also use this means previously.

gettext perhaps can be pardoned since its the one providing these macros in first place.

Quoted 1 line
Quoted 8 lines
Quoted 4 lines

Meanwhile, there should as least as possible recipe need to skip wiping macros. If no, we may need to reconsider the related implement in autotools.bbclass. From this perspective, I think we should better record the recipe in this general bbclass.

I agree, but so far it seems its only elfutils, if there are more then please mentioned then to the list
and perhaps a different solution should be sought.

Currently only found elfutils has this problem in my env. I think firstly if only one recipe, it's no big deal to record here as we wipe the per recipe macros in this autotools.bbclass(I didn't find other distribution wipe the macros). And secondly if there are other recipes need to skip the wiping, then it's just right to record here to prove we need to reconsider the related implements in autotools.bbclass.

Quoted 6 lines
Quoted 3 lines

this class is used everywhere, adding a check in this class would mean its executed in every recipe inehrititng it so no we are not doing it for one recipe.

I agree with Ross and Khem, this isn't a good fix. What issue are you seeing with elfutils? We're not seeing anything in our testing...

Hi RP,

Currently the 0004-Disable-the-test-to-convert-euc-jp.patch doesn't take effect actually as the elfutils m4 macro files wiped out and also result the below failure "bitbake -cconfigure elfutils && bitbake -cpatch elfutils -f".

Anyway, I will take other solutions.

Thanks,

Quoted 5 lines

Cheers,

Richard