[PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[Yu, Mingli]

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
m4 macros files such as iconv.m4 is removed and it's bad as we need to
patch against iconv.m4 shipped with elfutils.

BTW, the logic to Disable the unnecessary check in iconv.m4 comes since
2015 as [1], so move the related logic to gettext-minimal which provides
iconv.m4 now to fix the gap.

[1] https://git.openembedded.org/openembedded-core/commit/?id=3dd269e027fda173ee40d671ea47da22300fd51d

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
index e593b7270a..e04476bb7f 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
+++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
@@ -166,6 +166,7 @@ AC_DEFUN([AM_ICONV_LINK],
       }
   }
 #endif
+#if 0
   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
      provided.  */
   {
@@ -189,6 +190,7 @@ AC_DEFUN([AM_ICONV_LINK],
     if (cd4 != (iconv_t)(-1))
       iconv_close (cd4);
   }
+#endif
   return result;
 ]])],
           [am_cv_func_iconv_works=yes], ,
-- 
2.17.1

[PATCH v3 2/2] elfutils: remove 0004-Disable-the-test-to-convert-euc-jp.patch

[Yu, Mingli]

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
m4 macros files such as iconv.m4 is removed and it's bad as we need to
patch against iconv.m4 shipped with elfutils.

So remove 0004-Disable-the-test-to-convert-euc-jp.patch and move the logic
to gettext-mininal which provides iconv.m4 now to fix the gap and also fix
the below build issue.
  $ bitbake elfutils -cconfigure && bitbake elfutils -cpatch -f

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 .../elfutils/elfutils_0.183.bb                |  1 -
 ...4-Disable-the-test-to-convert-euc-jp.patch | 42 -------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
index 16ed7c9ddb..c0833686de 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
@@ -14,7 +14,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://0001-dso-link-change.patch \
            file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
            file://0003-fixheadercheck.patch \
-           file://0004-Disable-the-test-to-convert-euc-jp.patch \
            file://0006-Fix-build-on-aarch64-musl.patch \
            file://0001-libasm-may-link-with-libbz2-if-found.patch \
            file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
diff --git a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
deleted file mode 100644
index f407bdd0be..0000000000
--- a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From cd36f34c722dd0babd7beb13c968aa0780c9f726 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 15 Aug 2017 17:24:06 +0800
-Subject: [PATCH] Disable the test to convert euc-jp
-
-Remove the test "Test against HP-UX 11.11 bug:
-No converter from EUC-JP to UTF-8 is provided"
-since we don't support HP-UX and if the euc-jp is not
-installed on the host, the dependence will be built without
-iconv support and will cause guild-native building fail.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
-
-Rebase to 0.170
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
----
- m4/iconv.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/m4/iconv.m4 b/m4/iconv.m4
-index aa159c5..d16312b 100644
---- a/m4/iconv.m4
-+++ b/m4/iconv.m4
-@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
-       }
-   }
- #endif
-+#if 0
-   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-      provided.  */
-   if (/* Try standardized names.  */
-@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
-       /* Try HP-UX names.  */
-       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-     result |= 16;
-+#endif
-   return result;
- ]])],
-           [am_cv_func_iconv_works=yes], ,
-- 
2.17.1

Re: [OE-core] [PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[Alexander Kanavin]

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

Note that this m4 file is copied verbatim from upstream gettext, and will
be again overwritten on next gettext upgrade. You should figure out what’s
wrong specifically in elfutils tree, and work with elfutils upstream to
resolve it.

Alex

On Mon 22. Mar 2021 at 10.51, Yu, Mingli <mingli.yu@windriver.com> wrote:

> 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
> m4 macros files such as iconv.m4 is removed and it's bad as we need to
> patch against iconv.m4 shipped with elfutils.
>
> BTW, the logic to Disable the unnecessary check in iconv.m4 comes since
> 2015 as [1], so move the related logic to gettext-minimal which provides
> iconv.m4 now to fix the gap.
>
> [1]
> https://git.openembedded.org/openembedded-core/commit/?id=3dd269e027fda173ee40d671ea47da22300fd51d
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>  meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git
> a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
> b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
> index e593b7270a..e04476bb7f 100644
> --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
> +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
> @@ -166,6 +166,7 @@ AC_DEFUN([AM_ICONV_LINK],
>        }
>    }
>  #endif
> +#if 0
>    /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
>       provided.  */
>    {
> @@ -189,6 +190,7 @@ AC_DEFUN([AM_ICONV_LINK],
>      if (cd4 != (iconv_t)(-1))
>        iconv_close (cd4);
>    }
> +#endif
>    return result;
>  ]])],
>            [am_cv_func_iconv_works=yes], ,
> --
> 2.17.1
>
>
> 
>
>

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

Re: [OE-core] [PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[Yu, Mingli]

On 3/22/21 4:29 PM, Alexander Kanavin wrote:
> **[Please note: This e-mail is from an EXTERNAL e-mail address]
> 
> Note that this m4 file is copied verbatim from upstream gettext, and 
> will be again overwritten on next gettext upgrade. You should figure out 
> what’s wrong specifically in elfutils tree, and work with elfutils 
> upstream to resolve it.

Hi Alex,

The reason why we care out iconv.m4 is because want to keep the logic in 
https://git.openembedded.org/openembedded-core/commit/?id=3dd269e027fda173ee40d671ea47da22300fd51d 
which oe specific.

I think there is nothing wrong for elfutils switches to use AM_GNU_GETTEXT.

Thanks,

> 
> Alex
> 
> On Mon 22. Mar 2021 at 10.51, Yu, Mingli <mingli.yu@windriver.com 
> <mailto:mingli.yu@windriver.com>> wrote:
> 
>     From: Mingli Yu <mingli.yu@windriver.com
>     <mailto: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
>     m4 macros files such as iconv.m4 is removed and it's bad as we need to
>     patch against iconv.m4 shipped with elfutils.
> 
>     BTW, the logic to Disable the unnecessary check in iconv.m4 comes since
>     2015 as [1], so move the related logic to gettext-minimal which provides
>     iconv.m4 now to fix the gap.
> 
>     [1]
>     https://git.openembedded.org/openembedded-core/commit/?id=3dd269e027fda173ee40d671ea47da22300fd51d
> 
>     Signed-off-by: Mingli Yu <mingli.yu@windriver.com
>     <mailto:mingli.yu@windriver.com>>
>     ---
>       meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 | 2 ++
>       1 file changed, 2 insertions(+)
> 
>     diff --git
>     a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
>     b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
>     index e593b7270a..e04476bb7f 100644
>     --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
>     +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
>     @@ -166,6 +166,7 @@ AC_DEFUN([AM_ICONV_LINK],
>             }
>         }
>       #endif
>     +#if 0
>         /* Test against HP-UX 11.11 bug: No converter from EUC-JP to
>     UTF-8 is
>            provided.  */
>         {
>     @@ -189,6 +190,7 @@ AC_DEFUN([AM_ICONV_LINK],
>           if (cd4 != (iconv_t)(-1))
>             iconv_close (cd4);
>         }
>     +#endif
>         return result;
>       ]])],
>                 [am_cv_func_iconv_works=yes], ,
>     -- 
>     2.17.1
> 
> 
>     
> 

Re: [OE-core] [PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[Richard Purdie]

On Mon, 2021-03-22 at 11:29 +0300, Alexander Kanavin wrote:
> Note that this m4 file is copied verbatim from upstream gettext, and will 
> be again overwritten on next gettext upgrade. You should figure out what’s
> wrong specifically in elfutils tree, and work with elfutils upstream to 
> resolve it.

It's more that there is a silly/pointless macro that breaks native builds for
us, the issue is in gettext.

How about we set the cache value globally for this macro and drop the patch?

Cheers,

Richard

Re: [OE-core] [PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[Yu, Mingli]

On 3/22/21 11:24 PM, Richard Purdie wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
> 
> On Mon, 2021-03-22 at 11:29 +0300, Alexander Kanavin wrote:
>> Note that this m4 file is copied verbatim from upstream gettext, and will
>> be again overwritten on next gettext upgrade. You should figure out what’s
>> wrong specifically in elfutils tree, and work with elfutils upstream to
>> resolve it.
> 
> It's more that there is a silly/pointless macro that breaks native builds for
> us, the issue is in gettext.
> 
> How about we set the cache value globally for this macro and drop the patch?

Hi Richard,

Do you mean define a cached value for the marco AM_ICONV_LINK which we 
patch against?

Seems the definition of the macro AM_ICONV_LINK we want to patch is too 
long and I have searched via "grep -Rn CACHED_CONFIGUREVARS *" in
openembedded-core layer, didn't find this kind of usage. Not sure if 
it's appropriate.

Thanks,

> 
> Cheers,
> 
> Richard
> 

Re: [OE-core] [PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[Richard Purdie]

On Tue, 2021-03-23 at 14:25 +0800, Yu, Mingli wrote:
> 
> On 3/22/21 11:24 PM, Richard Purdie wrote:
> > [Please note: This e-mail is from an EXTERNAL e-mail address]
> > 
> > On Mon, 2021-03-22 at 11:29 +0300, Alexander Kanavin wrote:
> > > Note that this m4 file is copied verbatim from upstream gettext, and will
> > > be again overwritten on next gettext upgrade. You should figure out what’s
> > > wrong specifically in elfutils tree, and work with elfutils upstream to
> > > resolve it.
> > 
> > It's more that there is a silly/pointless macro that breaks native builds for
> > us, the issue is in gettext.
> > 
> > How about we set the cache value globally for this macro and drop the patch?
> 
> Hi Richard,
> 
> Do you mean define a cached value for the marco AM_ICONV_LINK which we 
> patch against?
> 
> Seems the definition of the macro AM_ICONV_LINK we want to patch is too 
> long and I have searched via "grep -Rn CACHED_CONFIGUREVARS *" in
> openembedded-core layer, didn't find this kind of usage. Not sure if 
> it's appropriate.

I've sent out a patch showing what I mean, see:
"site/elfutils/libunistring: Drop patching for iconv and set in site file"

Hopefully that fixes the issue.

Cheers,

Richard

Re: [OE-core] [PATCH v3 1/2] gettext-minimal: Disable the unnecessary check in iconv.m4

[Yu, Mingli]

On 3/23/21 7:11 PM, Richard Purdie wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
> 
> On Tue, 2021-03-23 at 14:25 +0800, Yu, Mingli wrote:
>>
>> On 3/22/21 11:24 PM, Richard Purdie wrote:
>>> [Please note: This e-mail is from an EXTERNAL e-mail address]
>>>
>>> On Mon, 2021-03-22 at 11:29 +0300, Alexander Kanavin wrote:
>>>> Note that this m4 file is copied verbatim from upstream gettext, and will
>>>> be again overwritten on next gettext upgrade. You should figure out what’s
>>>> wrong specifically in elfutils tree, and work with elfutils upstream to
>>>> resolve it.
>>>
>>> It's more that there is a silly/pointless macro that breaks native builds for
>>> us, the issue is in gettext.
>>>
>>> How about we set the cache value globally for this macro and drop the patch?
>>
>> Hi Richard,
>>
>> Do you mean define a cached value for the marco AM_ICONV_LINK which we
>> patch against?
>>
>> Seems the definition of the macro AM_ICONV_LINK we want to patch is too
>> long and I have searched via "grep -Rn CACHED_CONFIGUREVARS *" in
>> openembedded-core layer, didn't find this kind of usage. Not sure if
>> it's appropriate.
> 
> I've sent out a patch showing what I mean, see:
> "site/elfutils/libunistring: Drop patching for iconv and set in site file"

Thanks!

> 
> Hopefully that fixes the issue.
> 
> Cheers,
> 
> Richard
>