From 9c7a0beee093908e26c11e689e391f95410d35c2 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Fri, 15 Aug 2014 00:46:11 -0700 Subject: [PATCH 1/2] config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems Older MacOS systems prior to 10.5 do not have the CommonCrypto support Git uses so set NO_APPLE_COMMON_CRYPTO on those systems. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- config.mak.uname | 1 + 1 file changed, 1 insertion(+) diff --git a/config.mak.uname b/config.mak.uname index 7846bd7657..f8e12c9626 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -88,6 +88,7 @@ ifeq ($(uname_S),Darwin) NEEDS_LIBICONV = YesPlease ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2) OLD_ICONV = UnfortunatelyYes + NO_APPLE_COMMON_CRYPTO = YesPlease endif ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2) NO_STRLCPY = YesPlease From 9eeff2f6810d4f962aa78ddf43193fba26d9451a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 15 Aug 2014 10:02:46 -0700 Subject: [PATCH 2/2] 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 --- config.mak.uname | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index f8e12c9626..fde196f63a 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