"Kyle J. McKay" <mackyle@xxxxxxxxx> writes: > The below patch does the right thing. Conveniently there's already > a test for 10.4 and earlier so only a single line need be added. > > --Kyle > > ---- 8< ---- > Subject: [PATCH] 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 <mackyle@xxxxxxxxx> > --- > config.mak.uname | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/config.mak.uname b/config.mak.uname > index 7846bd76..f8e12c96 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 By the way, can we document this "uname_R on MacOS X" business nearby, perhaps like this? -- >8 -- Subject: 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..7e49aca 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 = Darwin 1.* + # - MacOS 10.x.? = Darwin (x+4).* for (1 <= x) + # i.e. "begins with [15678] and the a dot" means "10.4.* or older". ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2) OLD_ICONV = UnfortunatelyYes NO_APPLE_COMMON_CRYPTO = YesPlease -- 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