summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGary V. Vaughan <git@mlists.thewrittenword.com>2010-05-14 09:31:45 +0000
committerJunio C Hamano <gitster@pobox.com>2010-05-31 17:36:28 -0700
commit614dd90506476f82ab2595da384f71e78254f33e (patch)
tree9f9479350f4f01b00d0ae3d0a624d6c29737b2d5 /Makefile
parent520fbc2a0da2ba830a54b9e1992a3f658c3ae1db (diff)
downloadgit-614dd90506476f82ab2595da384f71e78254f33e.tar.gz
Makefile: SunOS 5.6 portability fix
Although configure takes care of most of this, set some default values for Solaris 2.6 (aka SunOS-5.6) to ensure git compiles even when configure is not used to build it. Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c23ac13290..f29ff85991 100644
--- a/Makefile
+++ b/Makefile
@@ -812,6 +812,18 @@ ifeq ($(uname_S),SunOS)
NO_MKDTEMP = YesPlease
NO_MKSTEMPS = YesPlease
NO_REGEX = YesPlease
+ ifeq ($(uname_R),5.6)
+ SOCKLEN_T = int
+ NO_HSTRERROR = YesPlease
+ NO_IPV6 = YesPlease
+ NO_SOCKADDR_STORAGE = YesPlease
+ NO_UNSETENV = YesPlease
+ NO_SETENV = YesPlease
+ NO_STRLCPY = YesPlease
+ NO_C99_FORMAT = YesPlease
+ NO_STRTOUMAX = YesPlease
+ GIT_TEST_CMP = cmp
+ endif
ifeq ($(uname_R),5.7)
NEEDS_RESOLV = YesPlease
NO_IPV6 = YesPlease