From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: davvid@gmail.com, "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH] macos: move NO_REGEX in macOS to config.mak.uname
Date: Sat, 25 Apr 2020 02:15:49 -0700 [thread overview]
Message-ID: <20200425091549.42293-1-carenas@gmail.com> (raw)
29de20504e (Makefile: fix default regex settings on Darwin, 2013-05-11)
added this flag to the Makefile since Mac OS X 10.8 at the time didn't
have a working REG_EXTENDED|REG_NEWLINE
move it to config.mak.uname where all the other system specific settings
are kept since e1b6dbb554 (Makefile: hoist uname autodetection to
config.mak.uname, 2013-01-03) and update the rule so it only applies to
those known broken versions as the problem was most likely fixed in the
next version when Apple imported TRE on their libc.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
Makefile | 1 -
config.mak.uname | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index dc356ce4dd..7e3fc7ca79 100644
--- a/Makefile
+++ b/Makefile
@@ -1308,7 +1308,6 @@ ifeq ($(uname_S),Darwin)
APPLE_COMMON_CRYPTO = YesPlease
COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
endif
- NO_REGEX = YesPlease
PTHREAD_LIBS =
endif
diff --git a/config.mak.uname b/config.mak.uname
index 0ab8e00938..f89acdd15f 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -125,6 +125,9 @@ ifeq ($(uname_S),Darwin)
HAVE_GETDELIM = YesPlease
endif
NO_MEMMEM = YesPlease
+ ifeq ($(shell test `expr "$(uname_R)" : '\([0-9]*\)\.'` -le 12 && echo 1),1)
+ NO_REGEX = YesPlease
+ endif
USE_ST_TIMESPEC = YesPlease
HAVE_DEV_TTY = YesPlease
COMPAT_OBJS += compat/precompose_utf8.o
--
2.26.2.569.g1d74ac4d14
reply other threads:[~2020-04-25 9:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200425091549.42293-1-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.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.
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).