mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
9a66711be1
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:
https://gitlab.com/buildroot.org/buildroot/-/issues/4
http://autobuild.buildroot.net/results/c074c2e22a7f764400ecc7dd1a6cd6022fa87fb9/
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
29 lines
1006 B
Diff
29 lines
1006 B
Diff
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
|
|
|