From cf810e4099adc824ee255cca68e67cf9c949fe87 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 3 Jun 2020 23:59:04 +0200 Subject: [PATCH] Revert "package/prosody: use correct bit32 package" This reverts commit fa84c176c2148a60103e850204180f86aa5baa73 that replace luabitop by lua_bit32 package when lua 5.1 is used. Since this change the prosody test in gitlab is fail due to missing lua-bitops [1]: Starting prosody: ************************** Prosody was unable to find lua-bitops This package can be obtained in the following ways: Source: http://bitop.luajit.org/ Debian/Ubuntu: sudo apt-get install lua-bitop luarocks: luarocks install luabitop WebSocket support will not be available More help can be found on our website, at https://prosody.im/doc/depends ************************** The upstream documentation [2] is misleading (or not uptodate) about lua-bit32 dependency. Since bitop is builtin since lua5.2, we probably need to select luabitop package only when lua 5.1 is used as lua interpreter. Tested with run-tests: ./support/testing/run-tests tests.package.test_prosody.TestProsodyLua51 [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/576271975 [2] https://prosody.im/doc/depends#bitop Signed-off-by: Romain Naour Cc: James Hilliard Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/prosody/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/prosody/Config.in b/package/prosody/Config.in index 0b01547103..c32ca20e23 100644 --- a/package/prosody/Config.in +++ b/package/prosody/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime