From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Mar 2019 07:16:34 +0000 (+0900)
Subject: Sync with maint
X-Git-Tag: v2.22.0-rc0~147
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be9f1c02241c31ff170aba6dc66079e511490d23?ds=inline;hp=-c

Sync with maint

* maint:
mingw: allow building with an MSYS2 runtime v3.x
---

be9f1c02241c31ff170aba6dc66079e511490d23
diff --combined config.mak.uname
index dcf8bd7c75,2011bac6d5..41e85fab1c
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -393,7 -393,6 +393,7 @@@ ifeq ($(uname_S),Windows
  	BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
  	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
 +		compat/win32/trace2_win32_process_info.o \
  		compat/win32/dirent.o
  	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
  	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
@@@ -530,6 -529,7 +530,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_STRTOUMAX = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_SVN_TESTS = YesPlease
 -	NO_PERL_MAKEMAKER = YesPlease
  	RUNTIME_PREFIX = YesPlease
  	HAVE_WPGMPTR = YesWeDo
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@@ -546,7 -546,6 +546,7 @@@
  	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
  	COMPAT_OBJS += compat/mingw.o compat/winansi.o \
 +		compat/win32/trace2_win32_process_info.o \
  		compat/win32/path-utils.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
  		compat/win32/dirent.o
@@@ -568,7 -567,7 +568,7 @@@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)
  	NO_GETTEXT = YesPlease
  	COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
  else
- 	ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
+ 	ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
  		# MSys2
  		prefix = /usr/
  		ifeq (MINGW32,$(MSYSTEM))