Re: [Buildroot] [PATCH 3/4] package/gdb: switch to GDB 11.x as the default version

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Thomas, All,

On 2022-08-13 10:35 +0200, Thomas Petazzoni via buildroot spake thusly:
> Now that GDB 12.x has been added, and GDB 9.x removed, we can make GDB
> 11.x the default version.
> 
> The handling of the GMP dependency needs a bit of change. Until now,
> the GMP dependency was needed when building full GDB (host or target)
> in version 11.x or 12.x, so we were explicitly checking whether those
> versions were enabled.
> 
> Now that only GDB 10.x and the ARC-specific version of GDB are the
> only remaining ones not needing GDB, we invert the logic: only those
                                 ,^^^
GMP ----------------------------'

> two versions do not trigger the addition of the GMP dependency.

I agree that we can invert the logic now, to simplify things later when
we eventually drop the older versions, but I fail to see how this is
related to changing the default version of gdb.

I've split the two changes into separate patches, fixed the typo, and
applied to next, thanks.

Regards,
Yann E. MORIN.

> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  package/gdb/Config.in      |  3 +--
>  package/gdb/Config.in.host |  6 +++---
>  package/gdb/gdb.mk         | 14 +++++++-------
>  3 files changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/package/gdb/Config.in b/package/gdb/Config.in
> index c50c3d517a..273b3072ae 100644
> --- a/package/gdb/Config.in
> +++ b/package/gdb/Config.in
> @@ -51,8 +51,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
>  	bool "full debugger"
>  	depends on BR2_USE_WCHAR
>  	depends on !BR2_sh
> -	select BR2_PACKAGE_GMP if BR2_GDB_VERSION_11
> -	select BR2_PACKAGE_GMP if BR2_GDB_VERSION_12
> +	select BR2_PACKAGE_GMP if !BR2_GDB_VERSION_10 && !BR2_arc
>  	select BR2_PACKAGE_NCURSES
>  
>  comment "full gdb on target needs a toolchain w/ wchar"
> diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
> index 9876c4e8bc..33ffc632ee 100644
> --- a/package/gdb/Config.in.host
> +++ b/package/gdb/Config.in.host
> @@ -41,7 +41,7 @@ config BR2_PACKAGE_HOST_GDB_SIM
>  
>  choice
>  	prompt "GDB debugger Version"
> -	default BR2_GDB_VERSION_10
> +	default BR2_GDB_VERSION_11
>  	depends on !BR2_arc
>  	help
>  	  Select the version of gdb you wish to use.
> @@ -63,8 +63,8 @@ endif
>  config BR2_GDB_VERSION
>  	string
>  	default "arc-2020.09-release-gdb" if BR2_arc
> -	default "10.2"	   if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB
> -	default "11.2"     if BR2_GDB_VERSION_11
> +	default "10.2"	   if BR2_GDB_VERSION_10
> +	default "11.2"     if BR2_GDB_VERSION_11 || !BR2_PACKAGE_HOST_GDB
>  	default "12.1"     if BR2_GDB_VERSION_12
>  	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
>  
> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
> index dd126b42ce..d2bbfcb290 100644
> --- a/package/gdb/gdb.mk
> +++ b/package/gdb/gdb.mk
> @@ -65,8 +65,9 @@ GDB_DEPENDENCIES += host-flex host-bison
>  HOST_GDB_DEPENDENCIES += host-flex host-bison
>  endif
>  
> -# Add the necessary host-gmp dependency for the newer releases of GDB
> -ifeq ($(BR2_GDB_VERSION_11)$(BR2_GDB_VERSION_12),y)
> +# All newer versions of GDB need host-gmp, so it's only for older
> +# versions that the dependency can be avoided.
> +ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc),)
>  HOST_GDB_DEPENDENCIES += host-gmp
>  endif
>  
> @@ -154,11 +155,10 @@ GDB_CONF_OPTS += \
>  	--without-curses
>  endif
>  
> -# When GDB >= 11.x (because it's enabled for the host) and we're
> -# building the full gdb for the target, we need gmp as a
> -# dependency. For now the default gdb version in Buildroot doesn't
> -# require gmp.
> -ifeq ($(BR2_GDB_VERSION_11)$(BR2_GDB_VERSION_12):$(BR2_PACKAGE_GDB_DEBUGGER),y:y)
> +# Starting from GDB 11.x, gmp is needed as a dependency to build full
> +# gdb. So we avoid the dependency only for GDB 10.x and the special
> +# version used on ARC.
> +ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),:y)
>  GDB_CONF_OPTS += \
>  	--with-libgmp-prefix=$(STAGING_DIR)/usr
>  GDB_DEPENDENCIES += gmp
> -- 
> 2.37.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/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 mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot