From: René Scharfe Date: Tue, 09 Dec 2025 19:35:34 GMT Subject: [PATCH] config.mak.uname: use iconv from Homebrew on macOS Message-ID: <16efc726-34be-44f5-aa92-4e82b663ab3d@web.de> In-Reply-To: <53690064-1c98-40e9-8b9a-7ba6bee63703@web.de> The library function iconv(3) supplied with macOS versions 15.7.2 (Sequoia) and 26.1 (Tahoe) is unreliable when doing conversions from ISO-2022-JP to UTF-8 in multiple steps; t3900 reports this breakage: not ok 17 - ISO-2022-JP should be shown in UTF-8 now not ok 25 - ISO-2022-JP should be shown in UTF-8 now not ok 38 - commit --fixup into ISO-2022-JP from UTF-8 As a workaround, use libiconv from Homebrew, if available. Helped-by: Koji Nakamaru Signed-off-by: René Scharfe --- config.mak.uname | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index 1691c6ae6e..1b305e38c6 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -182,6 +182,13 @@ ifeq ($(uname_S),Darwin) endif endif + ifeq ($(shell test -d /opt/homebrew/opt/libiconv/ && echo y),y) + ICONVDIR ?= /opt/homebrew/opt/libiconv + endif + ifeq ($(shell test -d /usr/local/opt/libiconv/ && echo y),y) + ICONVDIR ?= /usr/local/opt/libiconv + endif + BASIC_LDFLAGS += -framework CoreServices endif ifeq ($(uname_S),SunOS) -- 2.52.0