Skip to content

mingw: include the Python parts in the build

Johannes Schindelin via GitGitGadget git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 3 repliesIn review
  2. v11 patch 4 repliesSuperseded

Changes in v2 from the cover letter

* Instead of setting and then overriding NO_PYTHON, it is now only defined in the relevant parts of the Windows-specific section of config.mak.uname.
* As Junio pointed out, there is an unneeded empty definition of NO_GETTEXT; Let's remove it.
* The same holds for NO_CURL: No need to define it to the empty value.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3windows: include the Python bits when building Git for Windowsconfig.mak.uname+2 -10 replies
2/3mingw: remove unneeded `NO_GETTEXT` directiveconfig.mak.uname+0 -10 replies
3/3mingw: remove unneeded `NO_CURL` directiveconfig.mak.uname+0 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/3] mingw: include the Python parts in the build

I've actually had a variation of the patch to include th Python bits in Git for Windows's build ever since February 2015.

Changes since v1:

* Instead of setting and then overriding NO_PYTHON, it is now only defined in the relevant parts of the Windows-specific section of config.mak.uname.
* As Junio pointed out, there is an unneeded empty definition of NO_GETTEXT; Let's remove it.
* The same holds for NO_CURL: No need to define it to the empty value.

Johannes Schindelin (3):
windows: include the Python bits when building Git for Windows
mingw: remove unneeded NO_GETTEXT directive
mingw: remove unneeded NO_CURL directive

 config.mak.uname | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

base-commit: 23b219f8e3f2adfb0441e135f0a880e6124f766c
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1306%2Fdscho%2Fmsys2-python-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1306/dscho/msys2-python-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1306

Range-diff vs v1:

 -:  ----------- > 1:  5d9b087625a windows: include the Python bits when building Git for Windows
 -:  ----------- > 2:  019fb837d68 mingw: remove unneeded `NO_GETTEXT` directive
 1:  a5739b9cce8 ! 3:  7dc0a1a9aa8 mingw: include the Python parts in the build

@@ Metadata
Author: Johannes Schindelin <[email protected]>

## Commit message ##
- mingw: include the Python parts in the build
+ mingw: remove unneeded NO_CURL directive

- While Git for Windows does not _ship_ Python (in order to save on
- bandwidth), MSYS2 provides very fine Python interpreters that users can
- easily take advantage of, by using Git for Windows within its SDK.
+ In df5218b4c30 (config.mak.uname: support MSys2, 2016-01-13), we
+ introduced support for building Git for Windows in the then-brand new
+ Git for Windows v2.x build environment that was based off of MSYS2.
+
+ To do that, we split the non-msysGit part (that targeted MSys1) in two,
+ and instead of sharing the NO_CURL = YesPlease setting with MSys1, we
+ overrode it for MSYS2 with the empty value because we very much want to
+ build Git for Windows with libcurl.
+
+ But that was unnecessary: we never set that variable beforehand,
+ therefore there is no need to override it.
+
+ Let's just remove that unnecessary line.

## config.mak.uname ##
@@ config.mak.uname: else
+ HAVE_LIBCHARSET_H = YesPlease
+ USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE = YesPlease
- NO_CURL =
+- NO_CURL =
USE_NED_ALLOCATOR = YesPlease
-+ NO_PYTHON =
ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/
- ETC_GITCONFIG = ../etc/gitconfig

Signature · 1 line
gitgitgadget