diff mbox series

[9/9] package/sysvinit: add optional dependency to libxcrypt

Message ID 20240403153641.4122789-9-bernd@kuhls.net
State Accepted
Headers show
Series [1/9] package/apg: add optional dependency to libxcrypt | expand

Commit Message

Bernd Kuhls April 3, 2024, 3:36 p.m. UTC 
When glibc was bumped to version 2.39 in commit
b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated
libcrypt support.

As glibc's libcrypt was providing sysvinit's libcrypt dependency this
broke the sysvinit build using glibc version 2.39.

To fix this select the libxcrypt dependency to sysvinit when using a
glibc toolchain and add the dependency if selected.

Fixes:
http://autobuild.buildroot.net/results/3a9/3a99389bd7b6db7f9467b34c7bead1d58ce5a18d/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/sysvinit/Config.in   | 1 +
 package/sysvinit/sysvinit.mk | 4 ++++
 2 files changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/package/sysvinit/Config.in b/package/sysvinit/Config.in
index 7f27a70fcc..e5ca1d7f2d 100644
--- a/package/sysvinit/Config.in
+++ b/package/sysvinit/Config.in
@@ -3,6 +3,7 @@  config BR2_PACKAGE_SYSVINIT
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INIT_SYSV
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  System V style implementation of /sbin/init, parent of all
 	  processes
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 49c92ec2ac..7f37cea131 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -18,6 +18,10 @@  SYSVINIT_DEPENDENCIES += libselinux
 SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes"
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+SYSVINIT_DEPENDENCIES += libxcrypt
+endif
+
 define SYSVINIT_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(SYSVINIT_MAKE_OPTS) -C $(@D)/src
 endef