[PATCH] bash: fix non-fatal error in log.do_configure

[PATCH] bash: fix non-fatal error in log.do_configure

[Changqing Li]

From: Changqing Li <changqing.li@windriver.com>

error in log.do_configure:
ERROR: invalid first argument to AM_GNU_GETTEXT
ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.

autotools.bbclass removes aclocal.m4 and regenerate it, but used
gettext.m4 is different version with the local one included in source
tree, and the defination is different. Make configure.ac to use
correct argument.

upstream commit to remove argument no-libtool:
http://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=ed4cb97d6336f193f1aabe479f916469c26611e8

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 ...001-configure.ac-fix-non-fatal-error.patch | 37 +++++++++++++++++++
 meta/recipes-extended/bash/bash_5.1.bb        |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 meta/recipes-extended/bash/bash/0001-configure.ac-fix-non-fatal-error.patch

diff --git a/meta/recipes-extended/bash/bash/0001-configure.ac-fix-non-fatal-error.patch b/meta/recipes-extended/bash/bash/0001-configure.ac-fix-non-fatal-error.patch
new file mode 100644
index 0000000000..bf0e6fbf40
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/0001-configure.ac-fix-non-fatal-error.patch
@@ -0,0 +1,37 @@
+From e2bad7fa39f7234d54a7844c520d453d0e6f91f1 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 28 May 2021 15:14:50 +0800
+Subject: [PATCH] configure.ac: fix non fatal error
+
+fix non-fatal error in log.do_configure:
+ERROR: invalid first argument to AM_GNU_GETTEXT
+ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
+
+autotools.bbclass removes aclocal.m4 and regenerate it, but used
+gettext.m4 is different version with the local one included in source
+tree, and the defination is different. correct configure.ac to use
+correct argument.
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 77217ae..2c46ccd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -703,7 +703,7 @@ AC_C_VOLATILE
+ AC_C_RESTRICT
+ 
+ dnl initialize GNU gettext
+-AM_GNU_GETTEXT([no-libtool], [need-ngettext], [lib/intl])
++AM_GNU_GETTEXT([use-libtool], [need-ngettext], [lib/intl])
+ 
+ dnl header files
+ AC_HEADER_DIRENT
+-- 
+2.17.1
+
diff --git a/meta/recipes-extended/bash/bash_5.1.bb b/meta/recipes-extended/bash/bash_5.1.bb
index e5e013b734..3e4a74553c 100644
--- a/meta/recipes-extended/bash/bash_5.1.bb
+++ b/meta/recipes-extended/bash/bash_5.1.bb
@@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
            file://fix-run-builtins.patch \
            file://use_aclocal.patch \
            file://makerace.patch \
+           file://0001-configure.ac-fix-non-fatal-error.patch \
            "
 
 SRC_URI[tarball.sha256sum] = "cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa"
-- 
2.17.1

Re: [OE-core] [PATCH] bash: fix non-fatal error in log.do_configure

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

On Fri, 28 May 2021 at 10:31, Changqing Li <changqing.li@windriver.com>
wrote:

> error in log.do_configure:
> ERROR: invalid first argument to AM_GNU_GETTEXT
> ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer
> supported.
> + dnl initialize GNU gettext
> +-AM_GNU_GETTEXT([no-libtool], [need-ngettext], [lib/intl])
> ++AM_GNU_GETTEXT([use-libtool], [need-ngettext], [lib/intl])
>

This does look like something that should be properly fixed upstream, can
you rather make a patch that fixes the issue at the source please?

Alex

[-- Attachment #2: Type: text/html, Size: 898 bytes --]

Re: [OE-core] [PATCH] bash: fix non-fatal error in log.do_configure

[Changqing Li]

[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]


On 5/28/21 5:24 PM, Alexander Kanavin wrote:
>
> **[Please note: This e-mail is from an EXTERNAL e-mail address]
>
> On Fri, 28 May 2021 at 10:31, Changqing Li <changqing.li@windriver.com 
> <mailto:changqing.li@windriver.com>> wrote:
>
>     error in log.do_configure:
>     ERROR: invalid first argument to AM_GNU_GETTEXT
>     ERROR: Use of AM_GNU_GETTEXT without [external] argument is no
>     longer supported.
>     + dnl initialize GNU gettext
>     +-AM_GNU_GETTEXT([no-libtool], [need-ngettext], [lib/intl])
>     ++AM_GNU_GETTEXT([use-libtool], [need-ngettext], [lib/intl])
>
>
> This does look like something that should be properly fixed upstream, 
> can you rather make a patch that fixes the issue at the source please?

Upstream uses m4/gettext.m4 included in it's source tree,  which is 
lower version.  so don't have this issue. Maybe they will correct this 
problem when they update

m4 files in their source tree.

we have this issue since we use gettext.m4 in our sysroot, which has 
higher version gettext, in higher version, no-libtool is removed.

>
> Alex

[-- Attachment #2: Type: text/html, Size: 2810 bytes --]

Re: [OE-core] [PATCH] bash: fix non-fatal error in log.do_configure

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 669 bytes --]

On Mon, 31 May 2021 at 03:29, Changqing Li <changqing.li@windriver.com>
wrote:

> This does look like something that should be properly fixed upstream, can
> you rather make a patch that fixes the issue at the source please?
>
> Upstream uses m4/gettext.m4 included in it's source tree,  which is lower
> version.  so don't have this issue. Maybe they will correct this problem
> when they update
>
> m4 files in their source tree.
>
> we have this issue since we use gettext.m4 in our sysroot, which has
> higher version gettext, in higher version, no-libtool is removed.
>

So is it possible to send a patch upstream that updates gettext.m4?

Alex

[-- Attachment #2: Type: text/html, Size: 1247 bytes --]