From 09c882573cea6e18d98bea3132bf4e0b566a042a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Apr 2024 17:36:38 +0200 Subject: [PATCH] package/lighttpd: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. As glibc's libcrypt was providing lighttpd's libcrypt dependency this broke the lighttpd build using glibc version 2.39. To fix this select the libxcrypt dependency to lighttpd when using a glibc toolchain and add the dependency if selected. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/lighttpd/Config.in | 1 + package/lighttpd/lighttpd.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 5d9e624506..66532d7dd5 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIGHTTPD bool "lighttpd" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_XXHASH help lighttpd a secure, fast, compliant and very flexible diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 5109e3cebb..be8eda6b8d 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -30,6 +30,10 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +LIGHTTPD_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled