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

* [Buildroot] [PATCH] package/tar: fix linking with libiconv
@ 2024-06-30 21:09 Yann E. MORIN
  2024-07-15  8:28 ` Thomas Petazzoni via buildroot
  2024-08-20 19:57 ` Peter Korsgaard
  0 siblings, 2 replies; 4+ messages in thread
From: Yann E. MORIN @ 2024-06-30 21:09 UTC (permalink / raw)
  To: buildroot; +Cc: 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

^ permalink raw reply related	[flat|nested] 4+ messages in thread