From bfb15365b0e9ebb2e4f3facca282c7f585f96e3f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 28 Jul 2005 16:51:41 +0200 Subject: [PATCH] [PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS X On older Mac OS X (10.2.8), no socklen_t is defined, and therefore daemon.c does not compile. However, Mac OS X 10.4 seems to define socklen_t differently. Also, linking fails due to some symbols defined in libssl (not just libcrypto). [jc: I am tentatively dropping the socklen_t part of the patch because I am waiting for confirmation on the server side IPV6 patch from Yoshifuji-san] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index f50ad7239..f580576b2 100644 --- a/Makefile +++ b/Makefile @@ -95,9 +95,13 @@ ifdef PPC_SHA1 LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o else SHA1_HEADER= +ifeq ($(shell uname -s),Darwin) + LIBS += -lcrypto -lssl +else LIBS += -lcrypto endif endif +endif CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)' -- 2.30.2