summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarkus Duft <mduft@gentoo.org>2011-06-15 11:34:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-15 17:02:09 (GMT)
commit715876e58d2aeddf7e3b26e2fb5da0fc6e35e86f (patch)
tree476ce2e33142735ad884c44525ceac9f946bc98c /Makefile
parenta02cf90144293f4d7885be7f1d10240576aa161b (diff)
downloadgit-715876e58d2aeddf7e3b26e2fb5da0fc6e35e86f.zip
git-715876e58d2aeddf7e3b26e2fb5da0fc6e35e86f.tar.gz
git-715876e58d2aeddf7e3b26e2fb5da0fc6e35e86f.tar.bz2
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 <mduft@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index db72c45..c47cd4e 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)))