"Kyle J. McKay" <mackyle@xxxxxxxxx> writes: >> + # i.e. "begins with [15678] and the a dot" means "10.4.* or older". > > s/the a dot/a dot/ > >> ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2) >> OLD_ICONV = UnfortunatelyYes >> NO_APPLE_COMMON_CRYPTO = YesPlease > > Otherwise looks good. Mac OS X 10.1.0 doesn't actually fit the > pattern (it's still Darwin 1.*), but it's so old and it doesn't affect > the 10.4.* or older test (or the later 10.1.* or older test), so let's > just ignore that anomaly. :) Thanks. The 10.1.0 anomaly actually was bothering me, too. How about doing it this way? -- >8 -- Subject: [PATCH v2] config.mak.uname: add hint on uname_R for MacOS X I always have to scratch my head every time I see this cryptic pattern "[15678]\."; leave a short note to remind the maintainer and the reviewers. Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- config.mak.uname | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index f8e12c9..414760f 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -86,6 +86,10 @@ ifeq ($(uname_S),Darwin) NEEDS_CRYPTO_WITH_SSL = YesPlease NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease + # Note: $(uname_R) gives us the underlying Darwin version. + # - MacOS 10.0.* and MacOS 10.1.0 = Darwin 1.* + # - MacOS 10.x.* = Darwin (x+4).* for (1 <= x) + # i.e. "begins with [15678] and a dot" means "10.4.* or older". ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2) OLD_ICONV = UnfortunatelyYes NO_APPLE_COMMON_CRYPTO = YesPlease -- 2.1.0-rc2-283-g1433d67 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html