[Buildroot] [PATCH] package/tar: fix linking with libiconv

[Buildroot] [PATCH] package/tar: fix linking with libiconv

[Yann E. MORIN]

Backport two patches from upstream to fix linking with libiconv, e.g.
with this defconfig:

    BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
    BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
    BR2_SYSTEM_ENABLE_NLS=y
    BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
    BR2_PACKAGE_LIBICONV=y
    BR2_PACKAGE_TAR=y

It is interesting to note that the first patch we backport is the first
commit in the tar repository after the 1.35 tag, and was comitted the
same day the release was cut...

Fixes: #4

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 .../tar/0002-Fix-savannah-bug-#64441.patch    | 28 +++++++++++++++++
 package/tar/0003-tests-fix-LDADD.patch        | 30 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 package/tar/0002-Fix-savannah-bug-#64441.patch
 create mode 100644 package/tar/0003-tests-fix-LDADD.patch

diff --git a/package/tar/0002-Fix-savannah-bug-#64441.patch b/package/tar/0002-Fix-savannah-bug-#64441.patch
new file mode 100644
index 0000000000..049e08c27b
--- /dev/null
+++ b/package/tar/0002-Fix-savannah-bug-#64441.patch
@@ -0,0 +1,28 @@
+From 8632df398b2f548465ebe68b8f494c0d6f8d913d Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Tue, 18 Jul 2023 17:02:23 +0300
+Subject: Fix savannah bug #64441
+
+* src/Makefile.am (tar_LDADD): Add libiconv libraries.
+
+[yann.morin.1998@free.fr: backport from upstream]
+Upstream: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=8632df398b2f548465ebe68b8f494c0d6f8d913d
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+---
+ src/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 36c9543..e2ec58d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,4 +52,5 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\
+  $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
+  $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\
+- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL)
++ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \
++ $(LIBINTL) $(LIBICONV)
+-- 
+cgit v1.1
+
diff --git a/package/tar/0003-tests-fix-LDADD.patch b/package/tar/0003-tests-fix-LDADD.patch
new file mode 100644
index 0000000000..c00f14d2c1
--- /dev/null
+++ b/package/tar/0003-tests-fix-LDADD.patch
@@ -0,0 +1,30 @@
+From 71530f72d21d9af00b5688948111666f62f5ec4b Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed, 19 Jul 2023 15:48:25 -0700
+Subject: tests: fix LDADD
+
+Problem reported by Christian Weisgerber <naddy@mips.inka.de> in:
+https://lists.gnu.org/r/bug-tar/2023-07/msg00015.html
+* tests/Makefile.am (LDADD): Add $(LIBINTL), $(LIBICONV).
+
+[yann.morin.1998@free.fr: backport from upstream]
+Upstream: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=71530f72d21d9af00b5688948111666f62f5ec4b
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+---
+ tests/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 1884b72..b696f01 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -337,4 +337,5 @@ AM_CPPFLAGS = \
+ LDADD = ../gnu/libgnu.a\
+  $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
+  $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\
+- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL)
++ $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \
++ $(LIBINTL) $(LIBICONV)
+-- 
+cgit v1.1
+
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/tar: fix linking with libiconv

[Thomas Petazzoni via buildroot]

Hello Yann,

On Sun, 30 Jun 2024 23:09:38 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Backport two patches from upstream to fix linking with libiconv, e.g.
> with this defconfig:
> 
>     BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
>     BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
>     BR2_SYSTEM_ENABLE_NLS=y
>     BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
>     BR2_PACKAGE_LIBICONV=y
>     BR2_PACKAGE_TAR=y
> 
> It is interesting to note that the first patch we backport is the first
> commit in the tar repository after the 1.35 tag, and was comitted the
> same day the release was cut...
> 
> Fixes: #4

I've changed this to:

    Fixes:
    
     https://gitlab.com/buildroot.org/buildroot/-/issues/4
     http://autobuild.buildroot.net/results/c074c2e22a7f764400ecc7dd1a6cd6022fa87fb9/

I don't know if Peter will agree, but I find the full URL to the gitlab
issue to be clearer. One can directly click, we can more easily grep
through the git commit messages to find all commits that fix a Gitlab
issue, etc.

And of course, I've added an autobuilder failure.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/tar: fix linking with libiconv

[Thomas Petazzoni via buildroot]

Hello,

On Mon, 15 Jul 2024 10:28:48 +0200
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:

> I've changed this to:
> 
>     Fixes:
>     
>      https://gitlab.com/buildroot.org/buildroot/-/issues/4
>      http://autobuild.buildroot.net/results/c074c2e22a7f764400ecc7dd1a6cd6022fa87fb9/
> 
> I don't know if Peter will agree, but I find the full URL to the gitlab
> issue to be clearer. One can directly click, we can more easily grep
> through the git commit messages to find all commits that fix a Gitlab
> issue, etc.

Except these patches are touching Makefile.am, so we need
TAR_AUTORECONF = YES.

... except TAR_AUTORECONF = YES is fine for target tar, but not
host-tar, because it would add a dependency on
host-{autoconf,automake,libtool}, which themselves depend on host-tar.

This caused some failures in the autobuilders:

  http://autobuild.buildroot.net/results/efd/efdf7cf9ede810ed7f766cc4138b16054bc0c18a/build-end.log

So I added a quirk:

  https://gitlab.com/buildroot.org/buildroot/-/commit/69cbb563a124002fcb3e2725c3516b502587f9cc

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/tar: fix linking with libiconv

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Backport two patches from upstream to fix linking with libiconv, e.g.
 > with this defconfig:

 >     BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
 >     BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 >     BR2_SYSTEM_ENABLE_NLS=y
 >     BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 >     BR2_PACKAGE_LIBICONV=y
 >     BR2_PACKAGE_TAR=y

 > It is interesting to note that the first patch we backport is the first
 > commit in the tar repository after the 1.35 tag, and was comitted the
 > same day the release was cut...

 > Fixes: #4

 > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

Committed to 2024.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot