diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-07-28 16:51:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-07-29 00:12:03 -0700 |
| commit | bfb15365b0e9ebb2e4f3facca282c7f585f96e3f (patch) | |
| tree | 1d2e19b8765db51250ff238bc8770175f4c61893 /Makefile | |
| parent | 148519b7dc5a45ee73a85d39e4647099976be3b8 (diff) | |
| download | git-bfb15365b0e9ebb2e4f3facca282c7f585f96e3f.tar.gz | |
[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 <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -95,9 +95,13 @@ ifdef PPC_SHA1 LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o else SHA1_HEADER=<openssl/sha.h> +ifeq ($(shell uname -s),Darwin) + LIBS += -lcrypto -lssl +else LIBS += -lcrypto endif endif +endif CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)' |