Merge branch 'ab/auto-detect-zlib-compress2'

[thirdparty/git.git] / config.mak.uname

diff --git a/config.mak.uname b/config.mak.uname
index ff6485a0a4377d3741d555dce01921d691f689c8..4352ea39e9b9b7e2103560729202c63cb1fd90d4 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -66,7 +66,6 @@ ifeq ($(uname_S),Linux)
        # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
        ifneq ($(findstring .el7.,$(uname_R)),)
                BASIC_CFLAGS += -std=c99
-               NO_UNCOMPRESS2 = YesPlease
        endif
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)
@@ -268,10 +267,6 @@ ifeq ($(uname_S),FreeBSD)
        FILENO_IS_A_MACRO = UnfortunatelyYes
 endif
 ifeq ($(uname_S),OpenBSD)
-       # Versions < 7.0 need compatibility layer
-       ifeq ($(shell expr "$(uname_R)" : "[1-6]\."),2)
-               NO_UNCOMPRESS2 = UnfortunatelyYes
-       endif
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        USE_ST_TIMESPEC = YesPlease
@@ -531,7 +526,6 @@ ifeq ($(uname_S),Interix)
        endif
 endif
 ifeq ($(uname_S),Minix)
-       NO_UNCOMPRESS2 = YesPlease
        NO_IPV6 = YesPlease
        NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
        NO_NSEC = YesPlease
@@ -587,7 +581,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
        NO_SETENV = YesPlease
        NO_UNSETENV = YesPlease
        NO_MKDTEMP = YesPlease
-       NO_UNCOMPRESS2 = YesPlease
        # Currently libiconv-1.9.1.
        OLD_ICONV = UnfortunatelyYes
        NO_REGEX = NeedsStartEnd