git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 3/3] mingw: remove unneeded `NO_CURL` directive
Date: Fri, 29 Jul 2022 15:41:11 +0000	[thread overview]
Message-ID: <7dc0a1a9aa81fcd5c464c48995a61492fb97db1a.1659109272.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1306.v2.git.1659109272.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 config.mak.uname | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config.mak.uname b/config.mak.uname
index e897b80b3a7..d63629fe807 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -719,7 +719,6 @@ else
 		HAVE_LIBCHARSET_H = YesPlease
 		USE_GETTEXT_SCHEME = fallthrough
 		USE_LIBPCRE = YesPlease
-		NO_CURL =
 		USE_NED_ALLOCATOR = YesPlease
 		ifeq (/mingw64,$(subst 32,64,$(prefix)))
 			# Move system config into top-level /etc/
-- 
gitgitgadget

  parent reply	other threads:[~2022-07-29 15:41 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-28 14:01 [PATCH] mingw: include the Python parts in the build Johannes Schindelin via GitGitGadget
2022-07-28 17:29 ` Junio C Hamano
2022-07-29 14:29   ` Johannes Schindelin
2022-07-29 21:31     ` Johannes Sixt
2022-08-10  9:29       ` Johannes Schindelin
2022-07-29 15:41 ` [PATCH v2 0/3] " Johannes Schindelin via GitGitGadget
2022-07-29 15:41   ` [PATCH v2 1/3] windows: include the Python bits when building Git for Windows Johannes Schindelin via GitGitGadget
2022-07-29 15:41   ` [PATCH v2 2/3] mingw: remove unneeded `NO_GETTEXT` directive Johannes Schindelin via GitGitGadget
2022-07-29 15:41   ` Johannes Schindelin via GitGitGadget [this message]
2022-07-29 15:56   ` [PATCH v2 0/3] mingw: include the Python parts in the build Johannes Schindelin
2022-07-29 16:58     ` Junio C Hamano
2022-08-10  9:33       ` Overriding creation factor in format-patch, was " Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7dc0a1a9aa81fcd5c464c48995a61492fb97db1a.1659109272.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).