Skip to contentSkip to conversation

package/luaposix: 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/luaposix: 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 luaposix's libcrypt dependency this broke any luaposix build using glibc version 2.39.

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

---
 package/luaposix/Config.in   | 1 +
 package/luaposix/luaposix.mk | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
package/luaposix/Config.in +1 -0
index 85943f9915..bd2105743d 100644
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LUAPOSIX
 	# "bit" module, but since it has a different name, luaposix
 	# doesn't find it.
 	select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  This is a POSIX binding for LuaJIT, Lua 5.1 through 5.4;
 	  like most libraries it simply binds to C APIs on the
package/luaposix/luaposix.mk +4 -1
index d09a1bcd1d..680aeb8b81 100644
@@ -8,7 +8,10 @@ LUAPOSIX_VERSION = 36.2.1
 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION))
 LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = LICENSE
-LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
+LUAPOSIX_DEPENDENCIES = \
+	luainterpreter \
+	host-lua \
+	$(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt)
 
 define LUAPOSIX_BUILD_CMDS
 	(cd $(@D); \
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 22:50 -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 luaposix's libcrypt dependency this broke any luaposix build using glibc version 2.39.

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

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 40 lines
---
 package/luaposix/Config.in   | 1 +
 package/luaposix/luaposix.mk | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
package/luaposix/Config.in +1 -0
index 85943f9915..bd2105743d 100644
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LUAPOSIX
 	# "bit" module, but since it has a different name, luaposix
 	# doesn't find it.
 	select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  This is a POSIX binding for LuaJIT, Lua 5.1 through 5.4;
 	  like most libraries it simply binds to C APIs on the
package/luaposix/luaposix.mk +4 -1
index d09a1bcd1d..680aeb8b81 100644
@@ -8,7 +8,10 @@ LUAPOSIX_VERSION = 36.2.1
 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION))
 LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = LICENSE
-LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
+LUAPOSIX_DEPENDENCIES = \
+	luainterpreter \
+	host-lua \
+	$(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt)
 
 define LUAPOSIX_BUILD_CMDS
 	(cd $(@D); \
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