Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/busybox: fix build with glibc 2.39
@ 2024-07-15 10:16 Fred Lefranc
  2024-07-15 10:31 ` Thomas Petazzoni via buildroot
  2024-07-15 11:10 ` [Buildroot] [PATCH v2] " Fred Lefranc
  0 siblings, 2 replies; 13+ messages in thread
From: Fred Lefranc @ 2024-07-15 10:16 UTC (permalink / raw)
  To: buildroot; +Cc: Fred Lefranc

When glibc was bumped to version 2.39 in commit
b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated
libcrypt support.

As glibc's libcrypt was providing systemd's libcrypt dependency this
broke any systemd build using glibc version 2.39.

To fix this add the libxcrypt dependency to busybox which is the
preferred way of providing libcrypt support in busybox as the glibc
variant is only used as a fallback due to being deprecated.

Signed-off-by: Fred Lefranc <fred.lefranc+evs@gmail.com>
---
 package/busybox/Config.in  | 1 +
 package/busybox/busybox.mk | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 3c2aa515f8..85fa0c7f9a 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BUSYBOX
 	bool "BusyBox"
 	default y
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  The Swiss Army Knife of embedded Linux. It slices, it dices,
 	  it makes Julian Fries.
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index eb5e7ad922..d014b3d275 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)$(BR2_TOOLCHAIN_USES_GLIBC),yy)
+	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
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-08-28  8:49 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-15 10:16 [Buildroot] [PATCH] package/busybox: fix build with glibc 2.39 Fred Lefranc
2024-07-15 10:31 ` Thomas Petazzoni via buildroot
2024-07-15 11:10 ` [Buildroot] [PATCH v2] " Fred Lefranc
2024-07-15 14:08   ` Thomas Petazzoni via buildroot
2024-07-15 14:54     ` Fred Lefranc
2024-07-16  7:59   ` [Buildroot] [PATCH v3] " Fred Lefranc
2024-07-16 14:23     ` Thomas Petazzoni via buildroot
2024-07-16 17:32       ` Fred Lefranc
2024-07-16 19:39         ` Thomas Petazzoni via buildroot
2024-07-17 12:11     ` [Buildroot] [PATCH v4] " Fred Lefranc
2024-07-17 14:58       ` Thomas Petazzoni via buildroot
2024-07-17 15:52         ` Fred Lefranc
2024-08-28  8:49       ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox