From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: johannes.schindelin@gmx.de,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH] macos: do not assume brew and gettext are always available/wanted
Date: Fri, 24 Apr 2020 23:15:31 -0700 [thread overview]
Message-ID: <20200425061531.12845-1-carenas@gmail.com> (raw)
In-Reply-To: <pull.616.git.1587628367528.gitgitgadget@gmail.com>
since 27a7067308 (macos: do let the build find the gettext
headers/libraries/msgfmt, 2020-04-23) a build with `make NO_GETTEXT=1`
will throw warnings like :
LINK git
ld: warning: directory not found for option '-L/usr/local/opt/gettext/lib'
localize the change together with all the other package specific tweaks
and make sure it only applies when both gettext was needed and brew was
the provider.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
Makefile | 9 +++++++++
config.mak.uname | 7 ++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 9804a0758b..031a231ad6 100644
--- a/Makefile
+++ b/Makefile
@@ -1303,6 +1303,15 @@ ifeq ($(uname_S),Darwin)
BASIC_LDFLAGS += -L/opt/local/lib
endif
endif
+ ifndef NO_GETTEXT
+ ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
+ BASIC_CFLAGS += -I/usr/local/opt/gettext/include
+ BASIC_LDFLAGS += -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
+ endif
ifndef NO_APPLE_COMMON_CRYPTO
NO_OPENSSL = YesPlease
APPLE_COMMON_CRYPTO = YesPlease
diff --git a/config.mak.uname b/config.mak.uname
index 540d124d2e..0ab8e00938 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -133,11 +133,8 @@ ifeq ($(uname_S),Darwin)
HAVE_BSD_SYSCTL = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
- 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
+ BASIC_CFLAGS += -I/usr/local/include
+ BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
base-commit: 27a706730868835ec02a21a9ac4c4fcb3e05d330
--
2.26.2.569.g1d74ac4d14
next prev parent reply other threads:[~2020-04-25 6:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 7:52 [PATCH] macos: do let the build find the gettext headers/libraries/msgfmt Johannes Schindelin via GitGitGadget
2020-04-23 16:17 ` Eric Sunshine
2020-04-23 20:49 ` Eric Sunshine
2020-04-25 12:54 ` Johannes Schindelin
2020-04-26 15:54 ` Carlo Arenas
2020-04-26 16:59 ` Johannes Schindelin
2020-04-25 6:15 ` Carlo Marcelo Arenas Belón [this message]
2020-04-25 12:33 ` [PATCH] macos: do not assume brew and gettext are always available/wanted Johannes Schindelin
2020-04-25 12:54 ` [PATCH v2] macos: do let the build find the gettext headers/libraries/msgfmt Johannes Schindelin via GitGitGadget
2020-04-26 17:05 ` Torsten Bögershausen
2020-04-26 17:34 ` Carlo Marcelo Arenas Belón
2020-04-26 20:09 ` [PATCH v3 1/1] MacOs/brew: Let the build find " tboegi
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=20200425061531.12845-1-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).