From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Luke Diamand <luke@diamand.org>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 2/2] macOS: make sure that gettext is found
Date: Sun, 14 Apr 2019 14:19:29 -0700 (PDT) [thread overview]
Message-ID: <25be67b1b74e585571213c9af1a314b95969090b.1555276767.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.179.v2.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Due to reasons (some XCode versions seem to include gettext, some
don't?), Homebrew does not expose the libraries and headers in
/usr/local/ by default anymore.
Let's help find them again.
Note: for some reason, this is a change of behavior caused by the
upgrade to Mojave, identified in our Azure Pipeline; it seems that
Homebrew used to add the /usr/local/ directories to the include and link
search path before, but now it no longer does.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
config.mak.uname | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config.mak.uname b/config.mak.uname
index 41e85fab1c..3605fead53 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -114,6 +114,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
+ BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
--
gitgitgadget
prev parent reply other threads:[~2019-04-14 21:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 11:39 [PATCH 0/2] Prepare our git-p4 tests for running on APFS Johannes Schindelin via GitGitGadget
2019-04-12 11:39 ` [PATCH 1/2] t9822: skip tests if file names cannot be ISO-8895-1 encoded Johannes Schindelin via GitGitGadget
2019-04-13 7:39 ` Luke Diamand
2019-04-14 19:38 ` Johannes Schindelin
2019-04-12 11:39 ` [PATCH 2/2] macOS: make sure that gettext is found Johannes Schindelin via GitGitGadget
2019-04-14 21:19 ` [PATCH v2 0/2] Prepare our git-p4 tests for running on APFS Johannes Schindelin via GitGitGadget
2019-04-14 21:19 ` [PATCH v2 1/2] t9822: skip tests if file names cannot be ISO-8859-1 encoded Johannes Schindelin via GitGitGadget
2019-04-15 12:37 ` Johannes Schindelin
2019-04-15 12:53 ` Junio C Hamano
2019-04-17 11:48 ` Johannes Schindelin
2019-04-14 21:19 ` Johannes Schindelin via GitGitGadget [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=25be67b1b74e585571213c9af1a314b95969090b.1555276767.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=luke@diamand.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).