From: "René Scharfe" <l.s.r@web•de>
To: Git List <git@vger•kernel.org>
Cc: "Torsten Bögershausen" <tboegi@web•de>,
"Git List" <git@vger•kernel.org>,
"Carlo Marcelo Arenas Belón" <carenas@gmail•com>,
"brian m . carlson" <sandals@crustytoothpaste•net>,
"Koji Nakamaru" <koji.nakamaru@gree•net>,
"Yee Cheng Chin" <ychin.macvim@gmail•com>
Subject: [PATCH v3 1/2] macOS: make Homebrew use configurable
Date: Tue, 16 Dec 2025 19:53:37 +0100 [thread overview]
Message-ID: <98695ef0-b6bc-4929-8581-2ecb894cd604@web.de> (raw)
In-Reply-To: <53690064-1c98-40e9-8b9a-7ba6bee63703@web.de>
On macOS we opportunistically use Homebrew-installed versions of
gettext(3) and msgfmt(1). Make that behavior configurable by providing
make variables to disable Homebrew usage (NO_HOMEBREW), to allow using a
non-default installation location (HOMEBREW_PREFIX), and to control the
use of the individual items (USE_HOMEBREW_GETTEXT, USE_HOMEBREW_MSGFMT).
Precisely Link the gettext keg (the opt/gettext subdirectory) instead of
risking to link random other Homebrew-installed libraries as well.
Signed-off-by: René Scharfe <l.s.r@web•de>
---
Makefile | 28 ++++++++++++++++++++++++++++
config.mak.uname | 28 ++++++----------------------
2 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
index cf3f4b585f..a97e9e4d7d 100644
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,18 @@ include shared.mak
# specify your own (or DarwinPort's) include directories and
# library directories by defining CFLAGS and LDFLAGS appropriately.
#
+# Define NO_HOMEBREW if you don't want to use libraries and commands
+# installed by Homebrew.
+#
+# Define HOMEBREW_PREFIX if you have Homebrew installed in a non-default
+# location on macOS or on Linux and want to use it.
+#
+# Define USE_HOMEBREW_GETTEXT to link against the gettext library
+# installed by Homebrew, if present.
+#
+# Define USE_HOMEBREW_MSGFMT to use the msgfmt command installed by
+# Homebrew to compile message catalogs during build, if present.
+#
# Define NO_APPLE_COMMON_CRYPTO if you are building on Darwin/Mac OS X
# and do not want to use Apple's CommonCrypto library. This allows you
# to provide your own OpenSSL library, for example from MacPorts.
@@ -1692,6 +1704,22 @@ ifeq ($(uname_S),Darwin)
PTHREAD_LIBS =
endif
+ifndef NO_HOMEBREW
+ifdef HOMEBREW_PREFIX
+ifdef USE_HOMEBREW_GETTEXT
+ifeq ($(shell test -d $(HOMEBREW_PREFIX)/opt/gettext && echo y),y)
+ BASIC_CFLAGS += -I$(HOMEBREW_PREFIX)/opt/gettext/include
+ BASIC_LDFLAGS += -L$(HOMEBREW_PREFIX)/opt/gettext/lib
+endif
+endif
+ifdef USE_HOMEBREW_MSGFMT
+ifeq ($(shell test -x $(HOMEBREW_PREFIX)/opt/gettext/msgfmt && echo y),y)
+ MSGFMT = $(HOMEBREW_PREFIX)/opt/gettext/msgfmt
+endif
+endif
+endif
+endif
+
ifdef NO_LIBGEN_H
COMPAT_CFLAGS += -DNO_LIBGEN_H
COMPAT_OBJS += compat/basename.o
diff --git a/config.mak.uname b/config.mak.uname
index 1691c6ae6e..54e3a26649 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -149,29 +149,13 @@ ifeq ($(uname_S),Darwin)
CSPRNG_METHOD = arc4random
USE_ENHANCED_BASIC_REGULAR_EXPRESSIONS = YesPlease
- # Workaround for `gettext` being keg-only and not even being linked via
- # `brew link --force gettext`, should be obsolete as of
- # https://github.com/Homebrew/homebrew-core/pull/53489
- ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
- BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
- BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
- ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
- MSGFMT = /usr/local/opt/gettext/bin/msgfmt
- endif
- # On newer ARM-based machines the default installation path has changed to
- # /opt/homebrew. Include it in our search paths so that the user does not
- # have to configure this manually.
- #
- # Note that we do not employ the same workaround as above where we manually
- # add gettext. The issue was fixed more than three years ago by now, and at
- # that point there haven't been any ARM-based Macs yet.
- else ifeq ($(shell test -d /opt/homebrew/ && echo y),y)
- BASIC_CFLAGS += -I/opt/homebrew/include
- BASIC_LDFLAGS += -L/opt/homebrew/lib
- ifeq ($(shell test -x /opt/homebrew/bin/msgfmt && echo y),y)
- MSGFMT = /opt/homebrew/bin/msgfmt
- endif
+ ifeq ($(uname_M),arm64)
+ HOMEBREW_PREFIX = /opt/homebrew
+ else
+ HOMEBREW_PREFIX = /usr/local
endif
+ USE_HOMEBREW_GETTEXT = YesPlease
+ USE_HOMEBREW_MSGFMT = YesPlease
# The builtin FSMonitor on MacOS builds upon Simple-IPC. Both require
# Unix domain sockets and PThreads.
--
2.52.0
next prev parent reply other threads:[~2025-12-16 18:53 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
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 ` René Scharfe [this message]
2025-12-16 19:11 ` [PATCH v3 1/2] macOS: make Homebrew use configurable 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=98695ef0-b6bc-4929-8581-2ecb894cd604@web.de \
--to=l.s.r@web$(echo .)de \
--cc=carenas@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=koji.nakamaru@gree$(echo .)net \
--cc=sandals@crustytoothpaste$(echo .)net \
--cc=tboegi@web$(echo .)de \
--cc=ychin.macvim@gmail$(echo .)com \
/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