[Buildroot] [PATCH 1/1] package/gdb: zlib is mandatory, not optional

[Yann E. MORIN]

Fabrice, All,

On 2022-12-03 23:19 +0100, Fabrice Fontaine spake thusly:
> zlib is a mandatory dependency of gdb and by default, gdb will use its
> internal one. Moreover, --with-zlib has been replaced by
> --with-system-zlib since version 7.10 and
> https://github.com/bminor/binutils-gdb/commit/fa1f5da0b6ff3622f9bf60e348e149b76920abba

I checked if all the versions of gdb we have had this, and indeed, gdb
8.1 already had it.

> Fixes:
>  - https://bugs.buildroot.org/show_bug.cgi?id=15131
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/gdb/Config.in |  1 +
>  package/gdb/gdb.mk    | 12 ++++--------
>  2 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/package/gdb/Config.in b/package/gdb/Config.in
> index 273b3072ae..80b1185b5e 100644
> --- a/package/gdb/Config.in
> +++ b/package/gdb/Config.in
> @@ -17,6 +17,7 @@ config BR2_PACKAGE_GDB
>  	depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS
>  	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
>  	depends on BR2_INSTALL_LIBSTDCPP
> +	select BR2_PACKAGE_ZLIB
>  	# When the external toolchain gdbserver is copied to the
>  	# target, we don't allow building a separate gdbserver. The
>  	# one from the external toolchain should be used.
> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
> index 45ce126bab..4b9c5c6b70 100644
> --- a/package/gdb/gdb.mk
> +++ b/package/gdb/gdb.mk
> @@ -32,7 +32,8 @@ GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK
>  # also need ncurses.
>  # As for libiberty, gdb may use a system-installed one if present, so
>  # we must ensure ours is installed first.
> -HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses
> +GDB_DEPENDENCIES = zlib
> +HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib
>  
>  # Disable building documentation
>  GDB_MAKE_OPTS += MAKEINFO=true
> @@ -130,6 +131,7 @@ GDB_CONF_OPTS = \
>  	--disable-sim \
>  	$(GDB_DISABLE_BINUTILS_CONF_OPTS) \
>  	--without-included-gettext \
> +	--with-system-zlib \
>  	--disable-werror \
>  	--enable-static \
>  	--without-mpfr
> @@ -212,13 +214,6 @@ else
>  GDB_CONF_OPTS += --without-lzma
>  endif
>  
> -ifeq ($(BR2_PACKAGE_ZLIB),y)
> -GDB_CONF_OPTS += --with-zlib
> -GDB_DEPENDENCIES += zlib
> -else
> -GDB_CONF_OPTS += --without-zlib
> -endif
> -
>  ifeq ($(BR2_PACKAGE_GDB_PYTHON),)
>  # This removes some unneeded Python scripts and XML target description
>  # files that are not useful for a normal usage of the debugger.
> @@ -256,6 +251,7 @@ HOST_GDB_CONF_OPTS = \
>  	--enable-threads \
>  	--disable-werror \
>  	--without-included-gettext \
> +	--with-system-zlib \
>  	--with-curses \
>  	--without-mpfr \
>  	$(GDB_DISABLE_BINUTILS_CONF_OPTS)
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at 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.  |
'------------------------------^-------^------------------^--------------------'