From 7af8dee3a8a0559c2685237ec24f817f37669efc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Sep 2023 15:01:22 +0200 Subject: [PATCH] package/tcl: add mandatory dependency to zlib Tcl changed its zlib handling in upstream commit [1]. Before this commit, the HAVE_ZLIB macro was defined only if a zlib headers/library was found. After that commit, the HAVE_ZLIB macro is unconditionally defined. The only change is that: if a working zlib library is found in the toolchain sysroot, it is used. Otherwise, the package will use a shipped version in [2]. See also [3] and [4]. This tcl commit is included in Buildroot since commit 7fda943b43 "tcl: bump to version 8.6.1". In Buildroot, we prefer to not use bundled libraries wherever possible, so add an unconditional dependency to zlib. Further notes: This behavior leads to runtime failures, when the package is compiled with toolchains including zlib in their sysroot. This is because at configuration time, the package will detect zlib in the sysroot and link against it, but the library files won't be installed on target. This happen to be the case with Bootlin toolchains such as [5], as they also contaions gdbserver, and since 3341ceb1e585 (package/gdb: zlib is mandatory, not optional), we also build zlib even if only gdbserver is built (gdbserver does not use zlib, so that's a bug in our gdb packaging). This toolchain also happen to be the one used in basic configurations of the runtime test infrastructure (this issue was found while attempting to write a runtime test for tcl). In such cases, running "tclsh" command fails with error message: tclsh: error while loading shared libraries: libz.so.1: cannot open shared object file: No such file or directory libtcl library also miss its dependency. ldd /usr/lib/libtcl8.6.so libz.so.1 => not found libm.so.6 => /lib/libm.so.6 (0xb6dad000) libc.so.6 => /lib/libc.so.6 (0xb6c65000) /lib/ld-linux.so.3 (0xb6f6c000) [1] https://github.com/tcltk/tcl/commit/6f3dea45cee94f12ffa0b2acbbdb3eedbc01807b [2] https://github.com/tcltk/tcl/tree/core-8-6-13/compat/zlib [3] https://github.com/tcltk/tcl/blob/core-8-6-13/unix/configure.in#L172 [4] https://github.com/tcltk/tcl/blob/core-8-6-13/unix/Makefile.in#L240 [5] https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2023.08-1.tar.bz2 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/tcl/Config.in | 1 + package/tcl/tcl.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/tcl/Config.in b/package/tcl/Config.in index f1fa0541a1..adb9f22488 100644 --- a/package/tcl/Config.in +++ b/package/tcl/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_TCL # See this mailing list thread: # http://lists.busybox.net/pipermail/buildroot/2015-March/121198.html depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_ZLIB help TCL (Tool Command Language) is a simple textual language. diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 843d58a4ae..1943bc7b27 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -75,7 +75,8 @@ TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_MYSQL),mysql) \ - $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) + $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) \ + zlib $(eval $(autotools-package)) $(eval $(host-autotools-package))