public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web•de>
To: "René Scharfe" <l.s.r@web•de>
Cc: Git List <git@vger•kernel.org>, Koji Nakamaru <koji.nakamaru@gree•net>
Subject: Re: [PATCH] config.mak.uname: use iconv from Homebrew on macOS
Date: Wed, 10 Dec 2025 17:42:56 +0100	[thread overview]
Message-ID: <20251210164256.GA30949@tb-raspi4> (raw)
In-Reply-To: <16efc726-34be-44f5-aa92-4e82b663ab3d@web.de>

On Tue, Dec 09, 2025 at 08:35:34PM +0100, René Scharfe wrote:
> 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 <koji.nakamaru@gree•net>
> Signed-off-by: René Scharfe <l.s.r@web•de>
> ---
>  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
> 

(Probaly a stupid question:) Does libiconv from homebrew provide UTF-8-MAC ?
And does t3910 pass ?

I just realized that I am building against libiconv from mac ports,
since years.
Digging into the Makefile shows that we have a switch:
NO_DARWIN_PORTS
(and another one for FINK)
Does it make sense to have a switch here as well ?


  parent reply	other threads:[~2025-12-10 16:43 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-08 22:59 t3900 failure on macOS, iconv(3) broken? René Scharfe
2025-12-09  3:18 ` Koji Nakamaru
2025-12-09  3:50   ` Yee Cheng Chin
2025-12-09  4:03     ` Collin Funk
2025-12-09 16:33 ` Torsten Bögershausen
2025-12-09 19:35   ` René Scharfe
2025-12-09 21:24     ` Torsten Bögershausen
2025-12-09 22:25       ` René Scharfe
2025-12-09 19:35 ` [PATCH] config.mak.uname: use iconv from Homebrew on macOS René Scharfe
2025-12-09 20:39   ` Yee Cheng Chin
2025-12-09 21:27     ` René Scharfe
2025-12-10 11:17   ` Carlo Marcelo Arenas Belón
2025-12-10 17:56     ` René Scharfe
2025-12-11  2:53       ` Junio C Hamano
2025-12-11 11:17         ` Carlo Marcelo Arenas Belón
2025-12-12  2:20           ` Junio C Hamano
2025-12-12  9:16             ` René Scharfe
2025-12-12 10:02               ` Carlo Marcelo Arenas Belón
2025-12-12 13:04               ` Re* " Junio C Hamano
2025-12-12 13:48                 ` René Scharfe
2025-12-12 23:39                   ` Junio C Hamano
2025-12-10 16:42   ` Torsten Bögershausen [this message]
2025-12-10 17:56     ` René Scharfe
2025-12-10 23:10   ` brian m. carlson
2025-12-11  2:36     ` Junio C Hamano
2025-12-11  9:59       ` Junio C Hamano
2025-12-11 14:34         ` René Scharfe
2025-12-12  3:35           ` Junio C Hamano
2025-12-12 10:40 ` t3900 failure on macOS, iconv(3) broken? René Scharfe
2025-12-13 18:42 ` [PATCH v2 1/2] Makefile: add NO_HOMEBREW René Scharfe
2025-12-14  6:45   ` Torsten Bögershausen
2025-12-14  7:13     ` Junio C Hamano
2025-12-14  9:02       ` Torsten Bögershausen
2025-12-14 11:07         ` Junio C Hamano
2025-12-14 11:13       ` René Scharfe
2025-12-14 23:19         ` Junio C Hamano
2025-12-16 18:53           ` René Scharfe
2025-12-13 18:42 ` [PATCH v2 2/2] config.mak.uname: use iconv from Homebrew on macOS René Scharfe
2025-12-16 18:53 ` [PATCH v3 1/2] macOS: make Homebrew use configurable René Scharfe
2025-12-16 19:11   ` René Scharfe
2025-12-16 21:49     ` Torsten Bögershausen
2025-12-16 18:53 ` [PATCH v3 2/2] macOS: use iconv from Homebrew if present René Scharfe
2025-12-24  7:52 ` [PATCH v4 0/2] macOS: use iconv from Homebrew if needed and present René Scharfe
2025-12-24  8:02   ` [PATCH v4 1/2] macOS: make Homebrew use configurable René Scharfe
2025-12-24  8:03   ` [PATCH v4 2/2] macOS: use iconv from Homebrew if needed and present René Scharfe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251210164256.GA30949@tb-raspi4 \
    --to=tboegi@web$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    --cc=koji.nakamaru@gree$(echo .)net \
    --cc=l.s.r@web$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox