From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] toolchain: adjust version check to allow for single numbers
Date: Sun, 14 Jun 2020 22:05:08 +0200 [thread overview]
Message-ID: <20200614200508.GL2346@scaer> (raw)
In-Reply-To: <20200610235313.204905-1-nolange79@gmail.com>
Norbert, All,
On 2020-06-11 01:53 +0200, Norbert Lange spake thusly:
> A gcc compiler, which was configured with
> --with-gcc-major-version-only, will only return a single
> number. (debian does this for example).
>
> A simple modification allows the check to work with both
> single numbers (eg. '9') and full versions (eg. '9.2.1').
>
> Signed-off-by: Norbert Lange <nolange79@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> toolchain/helpers.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
> index 44d0c83d1e..17bc159f3e 100644
> --- a/toolchain/helpers.mk
> +++ b/toolchain/helpers.mk
> @@ -184,7 +184,7 @@ check_gcc_version = \
> exit 0 ; \
> fi; \
> real_version=`$(1) -dumpversion` ; \
> - if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \
> + if [[ ! "$${real_version}." =~ ^$${expected_version}\. ]] ; then \
> printf "Incorrect selection of gcc version: expected %s.x, got %s\n" \
> "$${expected_version}" "$${real_version}" ; \
> exit 1 ; \
> --
> 2.26.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-06-14 20:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 23:53 [Buildroot] [PATCH] toolchain: adjust version check to allow for single numbers Norbert Lange
2020-06-14 18:30 ` Romain Naour
2020-06-14 20:05 ` Yann E. MORIN [this message]
2020-07-13 7:05 ` Peter Korsgaard
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=20200614200508.GL2346@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox