[openwrt/openwrt] toolchain: adjust with recent glibc

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 12 14:41:18 PDT 2025


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/c571ac4bdf25b23b333f380591176628c5a20610

commit c571ac4bdf25b23b333f380591176628c5a20610
Author: Konstantin Demin <rockdrilla at gmail.com>
AuthorDate: Fri Jul 4 11:03:14 2025 +0300

    toolchain: adjust with recent glibc
    
    glibc 2.39 has removed libcrypt completely.
    
    Signed-off-by: Konstantin Demin <rockdrilla at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/19293
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 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 ab0c0545b0..d26d9ebd40 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 ; \




More information about the lede-commits mailing list