[Buildroot] [PATCH] package/gdb: gdbserver does not need zlib

[Yann E. MORIN]

Arnout, All,

On 2023-09-17 21:32 +0200, Arnout Vandecappelle via buildroot spake thusly:
> On 17/09/2023 17:23, Yann E. MORIN wrote:
[--SNIP--]
> >As Julien noticed, for example, tcl will try and link with zlib if
> >available, and at build time it is. But at runtime, it is not, and thus
> >tclsh fails to run; see 7af8dee3a8a0 (package/tcl: add mandatory
> >dependency to zlib)
>  So this commit should be reverted now?

No, because tcl unconditionally uses zlib: either a bundled version, or
the system one. 7af8dee3a8a0 ensured the system one is available and
used.

> >So, when we onlyt build gdbserver, we tell configure to not use a system
> >zlib, which triggers a build of the bundled one, which we do not use...
>  I didn't think this paragraph was very clear, so I reformulated it a
> little, and applied to master, thanks.

Better, indeed, thanks!

Regards,
Yann E. MORIN.

>  Regards,
>  Arnout
> 
> >
> >Reported-by: Julien Olivain <ju.o at free.fr>
> >Reported-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
> >Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
> >Cc: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> >---
> >  package/gdb/Config.in |  2 +-
> >  package/gdb/gdb.mk    | 14 ++++++++++----
> >  2 files changed, 11 insertions(+), 5 deletions(-)
> >
> >diff --git a/package/gdb/Config.in b/package/gdb/Config.in
> >index 20fd262c93..e4ab39a2bd 100644
> >--- a/package/gdb/Config.in
> >+++ b/package/gdb/Config.in
> >@@ -24,7 +24,6 @@ config BR2_PACKAGE_GDB
> >  	# The or1k musl port is incomplete, elf_gregset_t definition is missing:
> >  	# https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3
> >  	depends on !BR2_or1k || !BR2_TOOLCHAIN_USES_MUSL
> >-	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.
> >@@ -61,6 +60,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
> >  	depends on !BR2_sh
> >  	select BR2_PACKAGE_GMP if !BR2_arc
> >  	select BR2_PACKAGE_NCURSES
> >+	select BR2_PACKAGE_ZLIB
> >  comment "full gdb on target needs a toolchain w/ wchar"
> >  	depends on !BR2_sh
> >diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
> >index 0d41548ed0..070598b385 100644
> >--- a/package/gdb/gdb.mk
> >+++ b/package/gdb/gdb.mk
> >@@ -32,7 +32,6 @@ 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.
> >-GDB_DEPENDENCIES = zlib
> >  HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib
> >  # Disable building documentation
> >@@ -131,22 +130,29 @@ GDB_CONF_OPTS = \
> >  	--disable-sim \
> >  	$(GDB_DISABLE_BINUTILS_CONF_OPTS) \
> >  	--without-included-gettext \
> >-	--with-system-zlib \
> >  	--disable-werror \
> >  	--enable-static \
> >  	--without-mpfr \
> >  	--disable-source-highlight
> >  ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y)
> >+GDB_DEPENDENCIES += zlib
> >  GDB_CONF_OPTS += \
> >  	--enable-gdb \
> >-	--with-curses
> >+	--with-curses \
> >+	--with-system-zlib
> >  GDB_DEPENDENCIES += ncurses \
> >  	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
> >  else
> >+# When only building gdbserver, we don't need zlib. But we have no way to
> >+# tell the top-level configure that we don't need zlib: it either wants to
> >+# build the bundled one, or use the system one.
> >+# Since we're going to only install the gdbserver to the target, we don't
> >+# care that the bundled zlib is built, as it is not used.
> >  GDB_CONF_OPTS += \
> >  	--disable-gdb \
> >-	--without-curses
> >+	--without-curses \
> >+	--without-system-zlib
> >  endif
> >  # Starting from GDB 11.x, gmp is needed as a dependency to build full
> _______________________________________________
> 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.  |
'------------------------------^-------^------------------^--------------------'