36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From 6bec1e7e7fe0ae5bbeb66fc9f32b0b1dd156957d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sergey Poznyakoff <gray@gnu.org>
|
||
|
|
Date: Tue, 18 Jun 2024 14:31:17 +0200
|
||
|
|
Subject: [PATCH] Fix savannah bug #64441
|
||
|
|
|
||
|
|
* src/Makefile.am (tar_LDADD): Add libiconv libraries.
|
||
|
|
|
||
|
|
Adapted upstream commit 8632df398b2f548465ebe68b8f494c0d6f8d913d to patch
|
||
|
|
the pregenerated Makefile.in instead of Makefile.am to avoid invoking
|
||
|
|
automake which requires m4.
|
||
|
|
|
||
|
|
This is required for macOS, as otherwise it will fail with:
|
||
|
|
Undefined symbols for architecture arm64:
|
||
|
|
"_iconv", referenced from:
|
||
|
|
_utf8_convert in utf8.o
|
||
|
|
"_iconv_open", referenced from:
|
||
|
|
_utf8_convert in utf8.o
|
||
|
|
ld: symbol(s) not found for architecture arm64
|
||
|
|
clang: error: linker command failed with exit code 1 (use -v to see invocation)
|
||
|
|
---
|
||
|
|
src/Makefile.in | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/src/Makefile.in
|
||
|
|
+++ b/src/Makefile.in
|
||
|
|
@@ -1793,7 +1793,8 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLA
|
||
|
|
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)
|
||
|
|
|
||
|
|
all: all-am
|
||
|
|
|