From 029a9060538d398205a5317aed680cdb6744f33f Mon Sep 17 00:00:00 2001 From: Fred Lefranc Date: Wed, 17 Jul 2024 14:11:46 +0200 Subject: [PATCH] package/busybox: fix build with glibc 2.39 When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97, it removed the deprecated libcrypt support. Until the upgrade of glibc to 2.39, Busybox could rely on the libcrypt provided by glibc. Since version 2.39, glibc no longer provides libcrypt, causing a build failure with Busybox configurations that have CONFIG_USE_BB_CRYPT disabled. To fix this, add the libxcrypt dependency to Busybox when BR2_PACKAGE_LIBXCRYPT is selected. The user is still responsible for enabling BR2_PACKAGE_LIBXCRYPT when their Busybox configuration has CONFIG_USE_BB_CRYPT disabled. Signed-off-by: Fred Lefranc Signed-off-by: Thomas Petazzoni (cherry picked from commit a22f17881cce09c285067be096a683c523620826) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index eb5e7ad922..d25e5bf468 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -164,6 +164,10 @@ define BUSYBOX_SET_MDEV endef endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +BUSYBOX_DEPENDENCIES += libxcrypt +endif + # sha passwords need USE_BB_CRYPT_SHA ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) define BUSYBOX_SET_CRYPT_SHA