mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <>
To: "Johannes Schindelin via GitGitGadget" <>
Cc:, Johannes Schindelin <>
Subject: Re: [PATCH 1/1] mingw: allow building with an MSYS2 runtime v3.x
Date: Sun, 10 Mar 2019 10:09:44 +0900	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <> (Johannes Schindelin via GitGitGadget's message of "Fri, 08 Mar 2019 07:51:19 -0800 (PST)")

"Johannes Schindelin via GitGitGadget" <>

> So let's invert that test case to test for *anything else* than a
> version starting with "1" (for MSys). That should safeguard us for the
> future, even if Cygwin ends up releasing versionsl like 314.272.65536.

An obvious alternative is to do "2" -> "[23]" *and* update the else
to an explicit check for "1", *and* add an else that fails the build
when it sees "4" and other unknown ones.

I do not know how compatible MSYS2 runtime v4.x will be with the
settings the part inside the ifneq() we see here protects, but you
probably do, so I think this would be good enough.  The only case
that makes any difference is when v4.x _mostly_ satisifies but
slightly differs, affecting the built binary in a subtle way that is
not discovered right away.  But in such a case, the more cautious
"fail on '4' that we do not recognize" will not help much, as the
first reaction after seeing the error would be to copy the settings
that used to be OK with v2.x and v3.x anyway (which is what is being
done here---we start with the assumption that the support needed for
v3.x is largely the same as v2.x).

Will queue directly on top of... 'maint'?  'master'?

Let's say 'maint' and merge that up to 'master'.


> Signed-off-by: Johannes Schindelin <>
> ---
>  config.mak.uname | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/config.mak.uname b/config.mak.uname
> index c8b0e34c31..0207e895a4 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -569,7 +569,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
>  	NO_GETTEXT = YesPlease
>  else
> -	ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
> +	ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
>  		# MSys2
>  		prefix = /usr/
>  		ifeq (MINGW32,$(MSYSTEM))

  reply	other threads:[~2019-03-10  1:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-08 15:51 [PATCH 0/1] mingw: fix uname -r test Johannes Schindelin via GitGitGadget
2019-03-08 15:51 ` [PATCH 1/1] mingw: allow building with an MSYS2 runtime v3.x Johannes Schindelin via GitGitGadget
2019-03-10  1:09   ` Junio C Hamano [this message]
2019-03-11 16:32     ` 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:

  List information:

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

  git send-email \ \ \ \ \ \

* 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

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).