@matheusbsbs / matheus-bagliano / commits / a0b3108618
Fork 0

macOS/brew: let the build find gettext headers/libraries/msgfmt

Apparently a recent Homebrew update now installs `gettext` into the subdirectory /usr/local/opt/gettext/[lib/include]. Sometimes the ci job succeeds: brew link --force gettext Linking /usr/local/Cellar/gettext/0.20.1... 179 symlinks created And sometimes installing the package "gettext" with force-link fails: brew link --force gettext Warning: Refusing to link macOS provided/shadowed software: gettext If you need to have gettext first in your PATH run: echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile (And the is not the final word either, since macOS itself says: The default interactive shell is now zsh.) Anyway, The latter requires CFLAGS to include /usr/local/opt/gettext/include and LDFLAGS to include /usr/local/opt/gettext/lib. Likewise, the `msgfmt` tool is no longer in the `PATH`. While it is unclear which change is responsible for this breakage (that most notably only occurs on CI build agents that updated very recently), https://github.com/Homebrew/homebrew-core/pull/53489 has fixed it. Nevertheless, let's work around this issue, as there are still quite a few build agents out there that need some help in this regard: we explicitly do not call `brew update` in our CI/PR builds anymore. Helped-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Apr 26, 2020 at 22:09 UTC a0b31086182541750367f5625f2abd79e80819b0
1 file changed +11 -2
config.mak.uname
+11 -2
@@ -133,8 +133,17 @@ ifeq ($(uname_S),Darwin)
133 HAVE_BSD_SYSCTL = YesPlease
134 FREAD_READS_DIRECTORIES = UnfortunatelyYes
135 HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
136 - BASIC_CFLAGS += -I/usr/local/include
137 - BASIC_LDFLAGS += -L/usr/local/lib
136 +
137 + # Workaround for `gettext` being keg-only and not even being linked via
138 + # `brew link --force gettext`, should be obsolete as of
139 + # https://github.com/Homebrew/homebrew-core/pull/53489
140 + ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
141 + BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
142 + BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
143 + ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
144 + MSGFMT = /usr/local/opt/gettext/bin/msgfmt
145 + endif
146 + endif
147 endif
148 ifeq ($(uname_S),SunOS)
149 NEEDS_SOCKET = YesPlease