diff mbox series

[PATCH/next,3/3] prosody: fix runtime dependencies

Message ID 20181124090754.14775-4-francois.perrad@gadz.org
State Accepted
Headers show
Series suppport/testing: Lua and friends | expand

Commit Message

Francois Perrad Nov. 24, 2018, 9:07 a.m. UTC
prosody is not available for Lua 5.3, but only 5.1 & 5.2.

prosody needs the module BitOp which is included in LuaJIT

note: the actual config is working only LuaJIT
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/prosody/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Ricardo Martincoski Nov. 27, 2018, 2:29 a.m. UTC | #1
Hello,

I was reviewing/testing your test cases and I noticed in the cover letter [1]:
"note2: the patch 3/3 is a fix, and must be applied also in master"

+ Dushara (from 'utils/get-developers -f package/prosody/Config.in')
+ maintainers, to better decide whether it goes to master or it waits the
  release and later gets backported

I kept the full patch below.

[1] http://patchwork.ozlabs.org/cover/1002643/

On Sat, Nov 24, 2018 at 07:07 AM, Francois Perrad wrote:

> prosody is not available for Lua 5.3, but only 5.1 & 5.2.
> 
> prosody needs the module BitOp which is included in LuaJIT
> 
> note: the actual config is working only LuaJIT
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/prosody/Config.in | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/prosody/Config.in b/package/prosody/Config.in
> index 133b0b134..c32ca20e2 100644
> --- a/package/prosody/Config.in
> +++ b/package/prosody/Config.in
> @@ -2,7 +2,9 @@ config BR2_PACKAGE_PROSODY
>  	bool "prosody"
>  	depends on BR2_USE_MMU # fork
>  	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_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime
>  	select BR2_PACKAGE_LUAEXPAT # runtime
>  	select BR2_PACKAGE_LUASEC # runtime
>  	select BR2_PACKAGE_LUASOCKET # runtime
> @@ -19,3 +21,6 @@ config BR2_PACKAGE_PROSODY
>  comment "prosody needs the lua interpreter, dynamic library"
>  	depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_STATIC_LIBS
>  	depends on BR2_USE_MMU
> +
> +comment "prosody needs a Lua 5.1/5.2 interpreter"
> +	depends on BR2_PACKAGE_LUA_5_3
> -- 


Regards,
Ricardo
diff mbox series

Patch

diff --git a/package/prosody/Config.in b/package/prosody/Config.in
index 133b0b134..c32ca20e2 100644
--- a/package/prosody/Config.in
+++ b/package/prosody/Config.in
@@ -2,7 +2,9 @@  config BR2_PACKAGE_PROSODY
 	bool "prosody"
 	depends on BR2_USE_MMU # fork
 	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_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime
 	select BR2_PACKAGE_LUAEXPAT # runtime
 	select BR2_PACKAGE_LUASEC # runtime
 	select BR2_PACKAGE_LUASOCKET # runtime
@@ -19,3 +21,6 @@  config BR2_PACKAGE_PROSODY
 comment "prosody needs the lua interpreter, dynamic library"
 	depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_STATIC_LIBS
 	depends on BR2_USE_MMU
+
+comment "prosody needs a Lua 5.1/5.2 interpreter"
+	depends on BR2_PACKAGE_LUA_5_3