[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>maint
parent
148519b7dc
commit
bfb15365b0
4
Makefile
4
Makefile
|
@ -95,9 +95,13 @@ ifdef PPC_SHA1
|
||||||
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
|
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
|
||||||
else
|
else
|
||||||
SHA1_HEADER=<openssl/sha.h>
|
SHA1_HEADER=<openssl/sha.h>
|
||||||
|
ifeq ($(shell uname -s),Darwin)
|
||||||
|
LIBS += -lcrypto -lssl
|
||||||
|
else
|
||||||
LIBS += -lcrypto
|
LIBS += -lcrypto
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
|
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue