Lua 5.4
v3 cover Lua 5.4
This pacthset introduces Lua 5.4 serie.
Lua 5.4.0 is the first release of this new serie.
Packages which don't support Lua 5.3, don't support Lua 5.4 too.
Packages which need big change, are temporarily disabled (waiting for upstream).
v1 -> v2:
- refactor after the merge of James serie
- update after Thomas review
v2 -> v3:
- more refactor after the merge of James serie
Francois Perrad (10):
package/luabitop: depends on lua 5.1 package/lua-compat53: depends on lua ABI 5.1
lua: add 5.4.0 version package/lua-messagepack: add support of Lua 5.4 package/easybus: temporarily disabled with Lua 5.4 package/lua-cqueues: temporarily disabled with Lua 5.4 package/lua-flu: temporarily disabled with Lua 5.4 package/lua-sdl2: temporarily disabled with Lua 5.4 package/luv: temporarily disabled with Lua 5.4 package/prosody: temporarily disabled with Lua 5.4
package/easydbus/Config.in | 5 +- package/lua-compat53/Config.in | 2 +- package/lua-cqueues/Config.in | 5 +- package/lua-flu/Config.in | 5 +- package/lua-http/Config.in | 7 +- package/lua-messagepack/lua-messagepack.mk | 2 +- package/lua-sdl2/Config.in | 5 +- package/lua/5.4.0/0001-root-path.patch | 17 ++++ .../lua/5.4.0/0002-shared-libs-for-lua.patch | 78 +++++++++++++++++++ package/lua/5.4.0/0011-linenoise.patch | 25 ++++++ package/lua/Config.in | 6 +- package/lua/lua.hash | 3 + package/lua/lua.mk | 10 ++- package/luabitop/Config.in | 6 +- package/luainterpreter/Config.in | 4 + package/luv/Config.in | 5 +- package/pkg-luarocks.mk | 3 + package/prosody/Config.in | 4 + 18 files changed, 170 insertions(+), 22 deletions(-) create mode 100644 package/lua/5.4.0/0001-root-path.patch create mode 100644 package/lua/5.4.0/0002-shared-libs-for-lua.patch create mode 100644 package/lua/5.4.0/0011-linenoise.patch
Signature · 1 line
2.25.1
PATCH v3 1/10 package/luabitop: depends on lua 5.1
--- package/luabitop/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/luabitop/Config.in +3 -3
@@ -1,11 +1,11 @@ config BR2_PACKAGE_LUABITOP bool "luabitop" - depends on !BR2_PACKAGE_LUA_5_3 + depends on BR2_PACKAGE_LUA_5_1 help Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise operations on numbers. http://bitop.luajit.org -comment "luabitop needs a Lua 5.1/5.2 interpreter" - depends on BR2_PACKAGE_LUA_5_3 +comment "luabitop needs Lua 5.1" + depends on !BR2_PACKAGE_LUA_5_1
Signature · 1 line
2.25.1
PATCH v3 2/10 package/lua-compat53: depends on lua ABI 5.1
In reply to Francois Perrad--- package/lua-compat53/Config.in | 2 +- package/lua-http/Config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/lua-compat53/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_LUA_COMPAT53 bool "lua-compat53" - depends on !BR2_PACKAGE_LUA_5_3 + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 help Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1.
package/lua-http/Config.in +1 -1
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LUA_HTTP select BR2_PACKAGE_LPEG # runtime select BR2_PACKAGE_LUA_BASEXX # runtime select BR2_PACKAGE_LUA_BINARYHEAP # runtime - select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3 # runtime + select BR2_PACKAGE_LUA_COMPAT53 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime select BR2_PACKAGE_LUA_CQUEUES # runtime select BR2_PACKAGE_LUA_FIFO # runtime select BR2_PACKAGE_LUA_LPEG_PATTERNS # runtime
Signature · 1 line
2.25.1
PATCH v3 3/10 lua: add 5.4.0 version
In reply to Francois Perrad--- package/lua/5.4.0/0001-root-path.patch | 17 ++++ .../lua/5.4.0/0002-shared-libs-for-lua.patch | 78 +++++++++++++++++++ package/lua/5.4.0/0011-linenoise.patch | 25 ++++++ package/lua/Config.in | 6 +- package/lua/lua.hash | 3 + package/lua/lua.mk | 10 ++- package/luainterpreter/Config.in | 4 + package/pkg-luarocks.mk | 3 + 8 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 package/lua/5.4.0/0001-root-path.patch create mode 100644 package/lua/5.4.0/0002-shared-libs-for-lua.patch create mode 100644 package/lua/5.4.0/0011-linenoise.patch
package/lua/5.4.0/0001-root-path.patch new file +17 -0
@@ -0,0 +1,17 @@ +Adjust installation location to /usr. + +Signed-off-by: Francois Perrad <[email protected]> + +Index: b/src/luaconf.h +=================================================================== +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -227,7 +227,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" +
package/lua/5.4.0/0002-shared-libs-for-lua.patch new file +78 -0
78 lines not on this page · raw message
package/lua/5.4.0/0011-linenoise.patch new file +25 -0
@@ -0,0 +1,25 @@ +Add support of linenoise (replace readline) + +see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html + +Signed-off-by: Francois Perrad <[email protected]> + +Index: b/src/lua.c +=================================================================== +--- a/src/lua.c ++++ b/src/lua.c +@@ -401,6 +401,14 @@ + #define lua_saveline(L,line) ((void)L, add_history(line)) + #define lua_freeline(L,b) ((void)L, free(b)) + ++#elif defined(LUA_USE_LINENOISE) ++ ++#include <linenoise.h> ++#define lua_initreadline(L) ((void)L) ++#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL) ++#define lua_saveline(L,line) ((void)L, linenoiseHistoryAdd(line)) ++#define lua_freeline(L,b) ((void)L, free(b)) ++ + #else /* }{ */ + + #define lua_initreadline(L) ((void)L)
package/lua/Config.in +5 -1
@@ -26,9 +26,13 @@ config BR2_PACKAGE_LUA_5_3 bool "Lua 5.3.x" select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 +config BR2_PACKAGE_LUA_5_4 + bool "Lua 5.4.x" + select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 + endchoice -if BR2_PACKAGE_LUA_5_3 +if BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4 config BR2_PACKAGE_LUA_32BITS bool "Use 32 bit numbers" default y if !BR2_ARCH_IS_64
package/lua/lua.hash +3 -0
@@ -1,4 +1,7 @@ # Hashes from: http://www.lua.org/ftp/ +md5 dbf155764e5d433fc55ae80ea7060b60 lua-5.4.0.tar.gz +sha1 8cdbffa8a214a23d190d7c45f38c19518ae62e89 lua-5.4.0.tar.gz + md5 4f4b4f323fd3514a68e0ab3da8ce3455 lua-5.3.5.tar.gz sha1 112eb10ff04d1b4c9898e121d6bdf54a81482447 lua-5.3.5.tar.gz
package/lua/lua.mk +7 -3
@@ -4,7 +4,9 @@ # ################################################################################ -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUA_VERSION = 5.4.0 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.5 else LUA_VERSION = 5.1.5
@@ -12,7 +14,7 @@ endif LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) LUA_LICENSE_FILES = doc/readme.html else LUA_LICENSE_FILES = COPYRIGHT
@@ -22,7 +24,9 @@ LUA_PROVIDES = luainterpreter LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUA_CFLAGS += -DLUA_COMPAT_5_3 +else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_CFLAGS += -DLUA_COMPAT_5_2 endif
package/luainterpreter/Config.in +4 -0
@@ -9,6 +9,7 @@ config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION string default "5.1" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 default "5.3" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 + default "5.4" if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 bool
@@ -16,6 +17,9 @@ config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3 bool +config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4 + bool + config BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER string default "host-lua"
package/pkg-luarocks.mk +3 -0
@@ -23,6 +23,9 @@ HOST_LUAROCKS_CFLAGS = $(HOST_CFLAGS) -fPIC ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 +else ifeq ($(BR2_PACKAGE_LUA_5_4),y) +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3 +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3 endif ################################################################################
Signature · 1 line
2.25.1
PATCH v3 4/10 package/lua-messagepack: add support of Lua 5.4
In reply to Francois Perrad--- package/lua-messagepack/lua-messagepack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lua-messagepack/lua-messagepack.mk +1 -1
@@ -6,7 +6,7 @@ LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.2 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53 else LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack
Signature · 1 line
2.25.1
PATCH v3 4/10 package/lua-messagepack: add support of Lua 5.4
Quoted 11 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/lua-messagepack/lua-messagepack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/lua-messagepack/lua-messagepack.mk +0
-0
package/lua-messagepack/lua-messagepack.mk line 9
Quoted 5 lines
package/lua-messagepack/lua-messagepack.mk +1
-1@@ -6,7 +6,7 @@ LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.2 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y)
Might make sense to add/use some helpers for these use cases like:BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_AT_LEAST_5_3
Quoted 10 lines
package/lua-messagepack/lua-messagepack.mk +0
-1LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53 else LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack --2.25.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v3 4/10 package/lua-messagepack: add support of Lua 5.4
Le mer. 29 juil. 2020 ? 21:40, James Hilliard <[email protected]> a ?crit :
Quoted 15 lines
Review
Quoted 7 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/lua-messagepack/lua-messagepack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0
b/package/lua-messagepack/lua-messagepack.mkQuoted 5 lines
index
f393a8d02..33d460b4f100644package/lua-messagepack/lua-messagepack.mk +0
-0@@ -6,7 +6,7 @@
Quoted 7 lines
package/lua-messagepack/lua-messagepack.mk line 9
Quoted 4 lines
package/lua-messagepack/lua-messagepack.mk +1
-1LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.2 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 -ifeq ($(BR2_PACKAGE_LUA_5_3),y) +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y)Might make sense to add/use some helpers for these use cases like:
BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_AT_LEAST_5_3
There is only one use case, so overkill.
Lua is not gcc or Linux.
Fran?ois
Quoted 6 lines
Quoted 6 lines
package/lua-messagepack/lua-messagepack.mk +0
-1LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53 else LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack --2.25.1
Quoted 9 lines
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200730/baf91db6/attachment.html>
PATCH v3 5/10 package/easybus: temporarily disabled with Lua 5.4
In reply to Francois Perrad--- package/easydbus/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/easydbus/Config.in +3 -2
@@ -3,12 +3,13 @@ config BR2_PACKAGE_EASYDBUS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_LIBGLIB2 help Easy to use DBus library for Lua. https://github.com/mniestroj/easydbus -comment "easydbus needs a toolchain w/ wchar, threads" +comment "easydbus needs a toolchain w/ wchar, threads, Lua <= 5.3" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PACKAGE_LUA_5_4
Signature · 1 line
2.25.1
PATCH v3 6/10 package/lua-cqueues: temporarily disabled with Lua 5.4
In reply to Francois Perradand its reverse dependency
--- package/lua-cqueues/Config.in | 5 +++-- package/lua-http/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
package/lua-cqueues/Config.in +3 -2
@@ -1,6 +1,7 @@ config BR2_PACKAGE_LUA_CQUEUES bool "lua-cqueues" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_OPENSSL help Continuation Queues: Embeddable asynchronous networking,
@@ -8,5 +9,5 @@ config BR2_PACKAGE_LUA_CQUEUES http://25thandclement.com/~william/projects/cqueues.html -comment "lua-cqueues needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "lua-cqueues needs a toolchain w/ threads, Lua <= 5.3" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PACKAGE_LUA_5_4
package/lua-http/Config.in +3 -2
@@ -1,6 +1,7 @@ config BR2_PACKAGE_LUA_HTTP bool "lua-http" depends on BR2_TOOLCHAIN_HAS_THREADS # luaossl & lua-cqueues + depends on !BR2_PACKAGE_LUA_5_4 # lua-cqueues select BR2_PACKAGE_LPEG # runtime select BR2_PACKAGE_LUA_BASEXX # runtime select BR2_PACKAGE_LUA_BINARYHEAP # runtime
@@ -15,5 +16,5 @@ config BR2_PACKAGE_LUA_HTTP https://daurnimator.github.io/lua-http/ -comment "lua-http needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "lua-http needs a toolchain w/ threads, Lua <= 5.3" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PACKAGE_LUA_5_4
Signature · 1 line
2.25.1
PATCH v3 7/10 package/lua-flu: temporarily disabled with Lua 5.4
In reply to Francois Perrad--- package/lua-flu/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/lua-flu/Config.in +3 -2
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LUA_FLU depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse depends on BR2_USE_MMU # libfuse + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_ATTR select BR2_PACKAGE_LIBFUSE help
@@ -13,6 +14,6 @@ config BR2_PACKAGE_LUA_FLU http://piratery.net/flu/ -comment "lua-flu needs a toolchain w/ threads, dynamic library" +comment "lua-flu needs a toolchain w/ threads, dynamic library, Lua <= 5.3" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4
Signature · 1 line
2.25.1
PATCH v3 7/10 package/lua-flu: temporarily disabled with Lua 5.4
Quoted 11 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/lua-flu/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)package/lua-flu/Config.in +0
-0
package/lua-flu/Config.in config BR2_PACKAGE_LUA_FLU · line 6
Quoted 4 lines
package/lua-flu/Config.in +1
-0@@ -3,6 +3,7 @@ config BR2_PACKAGE_LUA_FLU depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse depends on BR2_USE_MMU # libfuse + depends on !BR2_PACKAGE_LUA_5_4
I think these should probably be for consistency:
depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4
Quoted 19 lines
package/lua-flu/Config.in +2
-3select BR2_PACKAGE_ATTR select BR2_PACKAGE_LIBFUSE help@@ -13,6 +14,6 @@ config BR2_PACKAGE_LUA_FLU http://piratery.net/flu/ -comment "lua-flu needs a toolchain w/ threads, dynamic library" +comment "lua-flu needs a toolchain w/ threads, dynamic library, Lua <= 5.3" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 --2.25.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v3 7/10 package/lua-flu: temporarily disabled with Lua 5.4
Le mer. 29 juil. 2020 ? 21:37, James Hilliard <[email protected]> a ?crit :
Quoted 8 lines
Quoted 6 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/lua-flu/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 12 lines
package/lua-flu/Config.in config BR2_PACKAGE_LUA_FLU · line 6
Quoted 9 lines
package/lua-flu/Config.in +1
-0@@ -3,6 +3,7 @@ config BR2_PACKAGE_LUA_FLU depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse depends on BR2_USE_MMU # libfuse + depends on !BR2_PACKAGE_LUA_5_4I think these should probably be for consistency:
depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_4
for me, only BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 makes sense, because it is a shortcut for BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT.
Fran?ois
Quoted 17 lines
package/lua-flu/Config.in config BR2_PACKAGE_LUA_FLU · line 17
Quoted 9 lines
package/lua-flu/Config.in +1
-1select BR2_PACKAGE_ATTR select BR2_PACKAGE_LIBFUSE help@@ -13,6 +14,6 @@ config BR2_PACKAGE_LUA_FLU http://piratery.net/flu/ -comment "lua-flu needs a toolchain w/ threads, dynamic library" +comment "lua-flu needs a toolchain w/ threads, dynamic library, Lua <=5.3"
package/lua-flu/Config.in config BR2_PACKAGE_LUA_FLU
Quoted 3 lines
package/lua-flu/Config.in +1
-1depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS ||
BR2_PACKAGE_LUA_5_4Quoted 3 lines
--
2.25.1
Quoted 9 lines
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200730/85157557/attachment.html>
PATCH v3 8/10 package/lua-sdl2: temporarily disabled with Lua 5.4
In reply to Francois Perrad--- package/lua-sdl2/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/lua-sdl2/Config.in +3 -2
@@ -1,6 +1,7 @@ config BR2_PACKAGE_LUA_SDL2 bool "lua-sdl2" depends on !BR2_STATIC_LIBS + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_SDL2 help Lua-SDL2 is a pure C binding of SDL2 to Lua 5.1, Lua 5.2,
@@ -8,5 +9,5 @@ config BR2_PACKAGE_LUA_SDL2 https://github.com/Tangent128/luasdl2 -comment "lua-sdl2 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "lua-sdl2 needs a toolchain w/ dynamic library, Lua <= 5.3" + depends on BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4
Signature · 1 line
2.25.1
PATCH v3 9/10 package/luv: temporarily disabled with Lua 5.4
In reply to Francois Perrad--- package/luv/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/luv/Config.in +3 -2
@@ -4,13 +4,14 @@ config BR2_PACKAGE_LUV depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on !BR2_PACKAGE_LUA_5_4 select BR2_PACKAGE_LIBUV help libuv bindings for LuaJIT and Lua. https://github.com/luvit/luv -comment "luv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "luv needs a toolchain w/ NPTL, dynamic library, Lua <= 5.3" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || BR2_PACKAGE_LUA_5_4 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4
Signature · 1 line
2.25.1
PATCH v3 10/10 package/prosody: temporarily disabled with Lua 5.4
In reply to Francois Perrad--- package/prosody/Config.in | 4 ++++ 1 file changed, 4 insertions(+)
package/prosody/Config.in +4 -0
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PROSODY 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_LUAEXPAT # runtime
@@ -20,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.3" + depends on BR2_PACKAGE_LUA_5_4
Signature · 1 line
2.25.1
v3 cover Lua 5.4
In reply to Francois PerradQuoted 11 lines · On Tue, 28 Jul 2020 15:21:37 +0200 Francois Perrad <[email protected]> wrote:
Francois Perrad (10):
package/luabitop: depends on lua 5.1 package/lua-compat53: depends on lua ABI 5.1
lua: add 5.4.0 version package/lua-messagepack: add support of Lua 5.4 package/easybus: temporarily disabled with Lua 5.4 package/lua-cqueues: temporarily disabled with Lua 5.4 package/lua-flu: temporarily disabled with Lua 5.4 package/lua-sdl2: temporarily disabled with Lua 5.4 package/luv: temporarily disabled with Lua 5.4 package/prosody: temporarily disabled with Lua 5.4
Thanks, series applied to next!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com