2
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.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[yann.morin.1998@free.fr: use more traditional ifeq-endif block]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
James Hilliard 1 жил өмнө
parent
commit
be2ed28968

+ 1 - 0
package/luaposix/Config.in

@@ -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

+ 4 - 0
package/luaposix/luaposix.mk

@@ -10,6 +10,10 @@ LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = LICENSE
 LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+LUAPOSIX_DEPENDENCIES += libxcrypt
+endif
+
 define LUAPOSIX_BUILD_CMDS
 	(cd $(@D); \
 		$(LUA_RUN) build-aux/luke \