Skip to contentSkip to conversation

package/screen: fix build with glibc 2.39

PATCH Applied James Hilliard 2 participants 2 messages Apr 2, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/screen: fix build with glibc 2.39

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

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

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

---
 package/screen/Config.in | 1 +
 package/screen/screen.mk | 4 ++++
 2 files changed, 5 insertions(+)
package/screen/Config.in +1 -0
index ee4c04ca9e..40cda77b50 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SCREEN
 	bool "screen"
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_NCURSES
 	help
 	  Screen is a full-screen window manager that multiplexes a
package/screen/screen.mk +4 -0
index d4052b1191..55fecb89bc 100644
@@ -16,6 +16,10 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)"
 SCREEN_CONF_OPTS = --enable-colors256
 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+SCREEN_DEPENDENCIES += libxcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 SCREEN_DEPENDENCIES += linux-pam
 SCREEN_CONF_OPTS += --enable-pam
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

James, All,

On 2024-04-01 23:26 -0600, James Hilliard spake thusly:

Quoted 11 lines

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

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

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

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 39 lines
---
 package/screen/Config.in | 1 +
 package/screen/screen.mk | 4 ++++
 2 files changed, 5 insertions(+)
package/screen/Config.in +1 -0
index ee4c04ca9e..40cda77b50 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SCREEN
 	bool "screen"
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_NCURSES
 	help
 	  Screen is a full-screen window manager that multiplexes a
package/screen/screen.mk +4 -0
index d4052b1191..55fecb89bc 100644
@@ -16,6 +16,10 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)"
 SCREEN_CONF_OPTS = --enable-colors256
 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+SCREEN_DEPENDENCIES += libxcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 SCREEN_DEPENDENCIES += linux-pam
 SCREEN_CONF_OPTS += --enable-pam
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot