From c571ac4bdf25b23b333f380591176628c5a20610 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Fri, 4 Jul 2025 11:03:14 +0300 Subject: [PATCH] toolchain: adjust with recent glibc glibc 2.39 has removed libcrypt completely. Signed-off-by: Konstantin Demin Link: https://github.com/openwrt/openwrt/pull/19293 Signed-off-by: Hauke Mehrtens --- package/libs/toolchain/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile index ab0c0545b0c..d26d9ebd400 100644 --- a/package/libs/toolchain/Makefile +++ b/package/libs/toolchain/Makefile @@ -555,7 +555,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) $(CP) \ $(TOOLCHAIN_DIR)/lib/ld*.so.* \ $(1)/lib/ - for file in libanl libc libcidn libcrypt libdl libm libnsl libnss_dns libnss_files libresolv libutil; do \ + for file in libanl libc libcidn libdl libm libnsl libnss_dns libnss_files libresolv libutil; do \ for file in $(TOOLCHAIN_DIR)/lib/$$$$file.so.*; do \ if [ -e "$$$$file" ]; then \ $(CP) $$$$file $(1)/lib/; \ @@ -700,6 +700,12 @@ else define Package/libc/install echo $(LIBC_VERSION)-r$(PKG_RELEASE) > $(TMP_DIR)/libc.version; \ for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \ + if [ '$(CONFIG_USE_GLIBC)' != '' ] ; then \ + case "$${file}" in \ + libcrypt.* | libcrypt-* | */libcrypt.* | */libcrypt-* ) \ + continue ;; \ + esac ; \ + fi ; \ $(INSTALL_DIR) $(1)/lib ; \ $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/lib/ ; \ done ; \