mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/mingw-with-python'

Browse Source 
Conditionally allow building Python interpreter on Windows

* js/mingw-with-python:
  mingw: remove unneeded `NO_CURL` directive
  mingw: remove unneeded `NO_GETTEXT` directive
  windows: include the Python bits when building Git for Windows
This commit is contained in:
Junio C Hamano
2022-08-08 13:13:13 -07:00
parent 6d97f440e5 2f0623aaa7
commit 8dfa09f49f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config.mak.uname
View File

@ -656,7 +656,6 @@ ifeq ($(uname_S),MINGW)
UNRELIABLE_FSTAT = UnfortunatelyYes UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease NO_REGEX = YesPlease
NO_PYTHON = YesPlease
ETAGS_TARGET = ETAGS ETAGS_TARGET = ETAGS
NO_POSIX_GOODIES = UnfortunatelyYes NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html DEFAULT_HELP_FORMAT = html
@ -686,6 +685,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
INTERNAL_QSORT = YesPlease INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT = YesPlease NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
else else
ifneq ($(shell expr "$(uname_R)" : '1\.'),2) ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
@ -717,10 +717,8 @@ else
INSTALL = /bin/install INSTALL = /bin/install
INTERNAL_QSORT = YesPlease INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT =
USE_GETTEXT_SCHEME = fallthrough USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE = YesPlease USE_LIBPCRE = YesPlease
NO_CURL =
USE_NED_ALLOCATOR = YesPlease USE_NED_ALLOCATOR = YesPlease
ifeq (/mingw64,$(subst 32,64,$(prefix))) ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/ # Move system config into top-level /etc/
@ -730,6 +728,7 @@ else
else else
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
NO_CURL = YesPlease NO_CURL = YesPlease
NO_PYTHON = YesPlease
endif endif
endif endif
endif endif