[Buildroot] [PATCH] toolchain: adjust version check to allow for single numbers

[Buildroot] [PATCH] toolchain: adjust version check to allow for single numbers

[Norbert Lange]

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>
---
 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] [PATCH] toolchain: adjust version check to allow for single numbers

[Romain Naour]

Hi,

Le 11/06/2020 ? 01:53, Norbert Lange a ?crit?:
> A gcc compiler, which was configured with
> --with-gcc-major-version-only, will only return a single
> number. (debian does this for example).

This option is available since gcc 8:

https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3c36aa6ba2be894d4092a6ce8129d39ef846c964

So older toolchain always provide a full version.

Reviewed-by: Romain Naour <romain.naour@gmail.com>

Best regards,
Romain

> 
> 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>
> ---
>  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 ; \
> 

[Buildroot] [PATCH] toolchain: adjust version check to allow for single numbers

[Yann E. MORIN]

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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH] toolchain: adjust version check to allow for single numbers

[Peter Korsgaard]

>>>>> "Norbert" == Norbert Lange <nolange79@gmail.com> writes:

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

Committed to 2020.02.x and 2020.05.x, thanks.

-- 
Bye, Peter Korsgaard