undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hj/remove-msys-support'

Browse Source 
Remove support for MSys, which now lags way behind MSys2.

* hj/remove-msys-support:
  mingw: remove msysGit/MSYS1 support
  mingw: remove duplicate `USE_NED_ALLOCATOR` directive
This commit is contained in:
Junio C Hamano 2023-02-09 14:40:47 -08:00
commit 4158b92f16
1 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config.mak.uname
View File

@ -624,6 +624,9 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
SHELL_PATH = /usr/coreutils/bin/bash SHELL_PATH = /usr/coreutils/bin/bash
endif endif
ifeq ($(uname_S),MINGW) ifeq ($(uname_S),MINGW)
ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
$(error "Building with MSys is no longer supported")
endif
pathsep = ; pathsep = ;
HAVE_ALLOCA_H = YesPlease HAVE_ALLOCA_H = YesPlease
NO_PREAD = YesPlease NO_PREAD = YesPlease
@ -653,7 +656,6 @@ ifeq ($(uname_S),MINGW)
USE_WIN32_IPC = YesPlease USE_WIN32_IPC = YesPlease
USE_WIN32_MMAP = YesPlease USE_WIN32_MMAP = YesPlease
MMAP_PREVENTS_DELETE = UnfortunatelyYes MMAP_PREVENTS_DELETE = UnfortunatelyYes
USE_NED_ALLOCATOR = YesPlease
UNRELIABLE_FSTAT = UnfortunatelyYes UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease NO_REGEX = YesPlease
@ -678,18 +680,6 @@ ifeq ($(uname_S),MINGW)
RC = windres -O coff RC = windres -O coff
NATIVE_CRLF = YesPlease NATIVE_CRLF = YesPlease
X = .exe X = .exe
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
htmldir = doc/git/html/
prefix =
INSTALL = /bin/install
EXTLIBS += /mingw/lib/libz.a
INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
else
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
# MSys2 # MSys2
prefix = /usr/ prefix = /usr/
# Enable DEP # Enable DEP
@ -726,12 +716,6 @@ else
ETC_GITCONFIG = ../etc/gitconfig ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes ETC_GITATTRIBUTES = ../etc/gitattributes
endif endif
else
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
NO_CURL = YesPlease
NO_PYTHON = YesPlease
endif
endif
endif endif
ifeq ($(uname_S),QNX) ifeq ($(uname_S),QNX)
COMPAT_CFLAGS += -DSA_RESTART=0 COMPAT_CFLAGS += -DSA_RESTART=0