[PATCH] macos: do let the build find the gettext headers/libraries/msgfmt
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Apr 23, 2020, 07:52 UTC
- Message-ID
- <pull.616.git.1587628367528.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Apparently a recent Homebrew update now installs `gettext` into a subdirectory under /usr/local/, requiring the CFLAGS/LDFLAGS to list explicit directories _even_ when asking to force-link the `gettext` package.
Likewise, the `msgfmt` tool is no longer in the `PATH`.
Let's work around this issue.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Prepare for Homebrew changing the gettext package
In an early Azure Pipelines preview of what is to come, I saw the
osx-clang and osx-gcc jobs fail consistently.
This patch tries to prevent that from affecting our CI/PR builds.Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-616%2Fdscho%2Fbrew-gettext-update-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-616/dscho/brew-gettext-update-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/616
config.mak.uname | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname index 0ab8e009383..540d124d2ef 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -133,8 +133,11 @@ ifeq ($(uname_S),Darwin) HAVE_BSD_SYSCTL = YesPlease FREAD_READS_DIRECTORIES = UnfortunatelyYes HAVE_NS_GET_EXECUTABLE_PATH = YesPlease - BASIC_CFLAGS += -I/usr/local/include - BASIC_LDFLAGS += -L/usr/local/lib + 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 endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease base-commit: e870325ee8575d5c3d7afe0ba2c9be072c692b65
-- gitgitgadget