[Buildroot] [PATCH 1/1] package/util-linux: add libxcrypt optional dependency

Fabrice Fontaine fontaine.fabrice at gmail.com
Thu Apr 4 21:06:40 UTC 2024


Fix the following build failures raised since bump of glibc to version
2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97:

configure: error: newgrp selected, but required crypt function not available

[...]

configure: error: sulogin selected, but required crypt function not available

Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97
 - http://autobuild.buildroot.org/results/961cd1221adf9ef8bfaff25b212351d10769c369
 - http://autobuild.buildroot.org/results/875a8d9ad76e844149d9a1c0c1983696e7313eff

Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
---
 package/util-linux/Config.in                          | 2 ++
 package/util-linux/util-linux-libs/util-linux-libs.mk | 1 +
 package/util-linux/util-linux.mk                      | 1 +
 3 files changed, 4 insertions(+)

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 73fa11380e..1f5dacec2f 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -280,6 +280,7 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT
 
 config BR2_PACKAGE_UTIL_LINUX_NEWGRP
 	bool "newgrp"
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Log in to a new group
 
@@ -402,6 +403,7 @@ comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library,
 config BR2_PACKAGE_UTIL_LINUX_SULOGIN
 	bool "sulogin"
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Single-user login
 
diff --git a/package/util-linux/util-linux-libs/util-linux-libs.mk b/package/util-linux/util-linux-libs/util-linux-libs.mk
index e1fe1ec191..0337e7e13a 100644
--- a/package/util-linux/util-linux-libs/util-linux-libs.mk
+++ b/package/util-linux/util-linux-libs/util-linux-libs.mk
@@ -24,6 +24,7 @@ UTIL_LINUX_LIBS_LICENSE_FILES = README.licensing \
 UTIL_LINUX_LIBS_INSTALL_STAGING = YES
 UTIL_LINUX_LIBS_DEPENDENCIES = \
 	host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \
 	$(TARGET_NLS_DEPENDENCIES)
 UTIL_LINUX_LIBS_CONF_OPTS += \
 	--disable-rpath \
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index a9e5b0bf68..f2821978c5 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -37,6 +37,7 @@ UTIL_LINUX_AUTORECONF = YES
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = \
 	host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \
 	$(TARGET_NLS_DEPENDENCIES)
 UTIL_LINUX_CONF_OPTS += \
-- 
2.43.0




More information about the buildroot mailing list