Browse Source

package/util-linux: add libxcrypt optional dependency

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@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine 1 year ago
parent
commit
b0865e2a76

+ 2 - 0
package/util-linux/Config.in

@@ -280,6 +280,7 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT
 
 
 config BR2_PACKAGE_UTIL_LINUX_NEWGRP
 config BR2_PACKAGE_UTIL_LINUX_NEWGRP
 	bool "newgrp"
 	bool "newgrp"
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	help
 	  Log in to a new group
 	  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
 config BR2_PACKAGE_UTIL_LINUX_SULOGIN
 	bool "sulogin"
 	bool "sulogin"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	help
 	  Single-user login
 	  Single-user login
 
 

+ 1 - 0
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_INSTALL_STAGING = YES
 UTIL_LINUX_LIBS_DEPENDENCIES = \
 UTIL_LINUX_LIBS_DEPENDENCIES = \
 	host-pkgconf \
 	host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \
 	$(TARGET_NLS_DEPENDENCIES)
 	$(TARGET_NLS_DEPENDENCIES)
 UTIL_LINUX_LIBS_CONF_OPTS += \
 UTIL_LINUX_LIBS_CONF_OPTS += \
 	--disable-rpath \
 	--disable-rpath \

+ 1 - 0
package/util-linux/util-linux.mk

@@ -37,6 +37,7 @@ UTIL_LINUX_AUTORECONF = YES
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = \
 UTIL_LINUX_DEPENDENCIES = \
 	host-pkgconf \
 	host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \
 	$(TARGET_NLS_DEPENDENCIES)
 	$(TARGET_NLS_DEPENDENCIES)
 UTIL_LINUX_CONF_OPTS += \
 UTIL_LINUX_CONF_OPTS += \