All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: qemu-devel@nongnu.org, Eric Blake <eblake@redhat.com>,
	qemu-trivial@nongnu.org
Subject: Re: [PATCH] configure: Escape non-numbers in version_ge()
Date: Tue, 02 Feb 2021 12:43:25 +0000	[thread overview]
Message-ID: <87mtwmtz9w.fsf@linaro.org> (raw)
In-Reply-To: <20210202104911.879393-1-philmd@redhat.com>


Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On Red Hat based distributions, the configure script emits various
> warnings:
>
>   # ./configure
>   Using './build' as the directory for build output
>   ./configure: line 212: test: 2-15: integer expression expected
>   ./configure: line 213: test: 2-15: integer expression expected
>   ./configure: line 212: test: el8: integer expression expected
>   ./configure: line 213: test: el8: integer expression expected
>
> This is produced by the gdb version check introduced in commit
> b1863ccc957 ("configure: gate our use of GDB to 8.3.1 or above"):
>
>     gdb_version=$($gdb_bin --version | head -n 1)
>     if version_ge ${gdb_version##* } 8.3.1; then
>         echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak
>     fi
>
> Because on RHEL/Fedora the minor version is not a plain number:
>
>   $ gdb --version | head -n 1
>   GNU gdb (GDB) Fedora 9.1-7.fc32
>
>   $ gdb --version | head -n 1
>   GNU gdb (GDB) Red Hat Enterprise Linux 8.2-15.el8
>
> Fix by only using the leading numbers, stripping the rest.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index e85d6baf8f8..21f6530a812 100755
> --- a/configure
> +++ b/configure
> @@ -205,7 +205,7 @@ version_ge () {
>          local_first=${2-0}
>          # 'shift 2' if $2 is set, or 'shift' if $2 is not set
>          shift ${2:+2}
> -        local_ver1=$*
> +        local_ver1=$(echo $* | sed -E 's/(^[0-9]+).*/\1/')
>          set x $local_ver2
>          # the second argument finished, the first must be greater or equal
>          test $# = 1 && return 0

I already have a fix that was posted in:

  Subject: [PATCH  v2 7/8] configure: make version_ge more tolerant of shady version input
  Date: Fri, 22 Jan 2021 18:18:53 +0000
  Message-Id: <20210122181854.23105-8-alex.bennee@linaro.org>

About to feature in the pre-PR series I'm about to post.

-- 
Alex Bennée


WARNING: multiple messages have this Message-ID (diff)
From: "Alex Bennée" <alex.bennee@linaro.org>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] configure: Escape non-numbers in version_ge()
Date: Tue, 02 Feb 2021 12:43:25 +0000	[thread overview]
Message-ID: <87mtwmtz9w.fsf@linaro.org> (raw)
In-Reply-To: <20210202104911.879393-1-philmd@redhat.com>


Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On Red Hat based distributions, the configure script emits various
> warnings:
>
>   # ./configure
>   Using './build' as the directory for build output
>   ./configure: line 212: test: 2-15: integer expression expected
>   ./configure: line 213: test: 2-15: integer expression expected
>   ./configure: line 212: test: el8: integer expression expected
>   ./configure: line 213: test: el8: integer expression expected
>
> This is produced by the gdb version check introduced in commit
> b1863ccc957 ("configure: gate our use of GDB to 8.3.1 or above"):
>
>     gdb_version=$($gdb_bin --version | head -n 1)
>     if version_ge ${gdb_version##* } 8.3.1; then
>         echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak
>     fi
>
> Because on RHEL/Fedora the minor version is not a plain number:
>
>   $ gdb --version | head -n 1
>   GNU gdb (GDB) Fedora 9.1-7.fc32
>
>   $ gdb --version | head -n 1
>   GNU gdb (GDB) Red Hat Enterprise Linux 8.2-15.el8
>
> Fix by only using the leading numbers, stripping the rest.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index e85d6baf8f8..21f6530a812 100755
> --- a/configure
> +++ b/configure
> @@ -205,7 +205,7 @@ version_ge () {
>          local_first=${2-0}
>          # 'shift 2' if $2 is set, or 'shift' if $2 is not set
>          shift ${2:+2}
> -        local_ver1=$*
> +        local_ver1=$(echo $* | sed -E 's/(^[0-9]+).*/\1/')
>          set x $local_ver2
>          # the second argument finished, the first must be greater or equal
>          test $# = 1 && return 0

I already have a fix that was posted in:

  Subject: [PATCH  v2 7/8] configure: make version_ge more tolerant of shady version input
  Date: Fri, 22 Jan 2021 18:18:53 +0000
  Message-Id: <20210122181854.23105-8-alex.bennee@linaro.org>

About to feature in the pre-PR series I'm about to post.

-- 
Alex Bennée


  reply	other threads:[~2021-02-02 12:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 10:49 [PATCH] configure: Escape non-numbers in version_ge() Philippe Mathieu-Daudé
2021-02-02 10:49 ` Philippe Mathieu-Daudé
2021-02-02 12:43 ` Alex Bennée [this message]
2021-02-02 12:43   ` Alex Bennée
2021-02-02 13:25   ` Philippe Mathieu-Daudé
2021-02-02 13:25     ` Philippe Mathieu-Daudé

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=87mtwmtz9w.fsf@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=eblake@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.