From: Thomas Petazzoni Date: Wed, 12 Aug 2020 14:49:22 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=336b4a639a3678a1fca0db0a6e89f1dc661e9e80;p=buildroot.git Merge branch 'master' into next --- 336b4a639a3678a1fca0db0a6e89f1dc661e9e80 diff --cc package/prosody/Config.in index d57da00a94,bb3a5025fa..d93350702c --- a/package/prosody/Config.in +++ b/package/prosody/Config.in @@@ -2,9 -2,8 +2,9 @@@ config BR2_PACKAGE_PROSOD bool "prosody" depends on BR2_USE_MMU # fork depends on BR2_PACKAGE_HAS_LUAINTERPRETER + depends on !BR2_PACKAGE_LUA_5_4 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime + select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime