From: Markus Duft Date: Wed, 15 Jun 2011 11:34:18 +0000 (+0200) Subject: Update the Interix default build configuration. X-Git-Tag: v1.7.7-rc0~104^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=715876e58d2aeddf7e3b26e2fb5da0fc6e35e86f;p=git.git Update the Interix default build configuration. Currently, on Interix, libsuacomp is required for building (see [1]). Since suacomp provides poll() and inttypes.h for all interix versions, remove NO_*=YesPlease that are no longer necessary. Interix versions 3 and 5 miss struct sockaddr_storage, so make git avoid using it. Same for FNMATCH_CASEFOLD, which does not exist for Interix 3 and 5. [1] http://news.gmane.org/find-root.php?message_id=%3c4DDF4440.4040405%40gentoo.org%3e Signed-off-by: Markus Duft Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index db72c45f3..c47cd4e30 100644 --- a/Makefile +++ b/Makefile @@ -1113,8 +1113,6 @@ endif X = .exe endif ifeq ($(uname_S),Interix) - NO_SYS_POLL_H = YesPlease - NO_INTTYPES_H = YesPlease NO_INITGROUPS = YesPlease NO_IPV6 = YesPlease NO_MEMMEM = YesPlease @@ -1125,10 +1123,14 @@ ifeq ($(uname_S),Interix) ifeq ($(uname_R),3.5) NO_INET_NTOP = YesPlease NO_INET_PTON = YesPlease + NO_SOCKADDR_STORAGE = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease endif ifeq ($(uname_R),5.2) NO_INET_NTOP = YesPlease NO_INET_PTON = YesPlease + NO_SOCKADDR_STORAGE = YesPlease + NO_FNMATCH_CASEFOLD = YesPlease endif endif ifneq (,$(findstring MINGW,$(uname_S)))