Git Mailing List Archive mirror
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox.com>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Handle compiler versions containing a dash
Date: Mon, 24 Apr 2023 14:40:00 -0700	[thread overview]
Message-ID: <xmqqo7nd9cy7.fsf@gitster.g> (raw)
In-Reply-To: <20230423091249.2591136-1-mh@glandium.org> (Mike Hommey's message of "Sun, 23 Apr 2023 18:12:49 +0900")

Mike Hommey <mh@glandium.org> writes:

> The version reported by e.g. x86_64-w64-mingw32-gcc on Debian bullseye
> looks like:
>   gcc version 10-win32 20210110 (GCC)
>
> This ends up with detect-compiler failing with:
>   ./detect-compiler: 30: test: Illegal number: 10-win32
>
> This change removes the -win32 part by excluding the dash and everything
> that follows from the version.

This may help the "test "$version" -gt 0" check and $((version - 1))
to pass.  It is not quite clear if/why it gives sensible results,
though.

> ---
>  detect-compiler | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Missing sign-off?

> diff --git a/detect-compiler b/detect-compiler
> index 50087f5670..d961df5fb5 100755
> --- a/detect-compiler
> +++ b/detect-compiler
> @@ -17,7 +17,7 @@ get_family() {
>  }
>  
>  get_version() {
> -	get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/'
> +	get_version_line | sed 's/^.* version \([0-9][^ -]*\).*/\1/'

The original is bad enough in that it says "We take anything that
begins with a digit up to (but not including) the first SP, and then
it assumes that it is getting an integer.  This one is not all that
better in that it can still accept a garbage like "version 01xx-foo"
and "test "$version" -gt 0" would fail the same way, no?

If we are sure that "version N-win32" is always equivalent to
"version N" for the purpose of print_flags() helper function, it may
be more prudent to allow the known-good ones, with something like

	# A string that begins with a digit up to the next SP
	ver=$(get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/')

	# There are known -variant suffixes that do not affect the
	# meaning of the main version number.  Strip them.
	ver=${ver%-win32}
	ver=${ver%-win64}
	...
	echo "$ver"

while keeping the ones that are not "known-to-be-good" as-is.

That way, non-numeric numbers that we do not know about how to
interpret will continue to stop detect-compiler from giving a bogus
answer, which would be better than silently accepting anything with
dash and treat as if the string after the number does not make any
difference.

One thing I am worried about is "10-prerelease" that is not quite
"10" yet to be treated just like "10" and causing problems.

Thanks.

next prev parent reply	other threads:[~2023-04-24 21:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-23  9:12 [PATCH] Handle compiler versions containing a dash Mike Hommey
2023-04-24 21:40 ` Junio C Hamano [this message]
2023-04-26  0:48   ` [PATCH] Handle some " Mike Hommey

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

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

  git send-email \
    --in-reply-to=xmqqo7nd9cy7.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=mh@glandium.org \
    /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

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