[Buildroot] [PATCH v3 00/10] Lua 5.4

[Buildroot] [PATCH v3 00/10] Lua 5.4

[Francois Perrad]

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

-- 
2.25.1

[Buildroot] [PATCH v3 01/10] package/luabitop: depends on lua 5.1

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/luabitop/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/luabitop/Config.in b/package/luabitop/Config.in
index a819fe8ae..656b1c739 100644
--- a/package/luabitop/Config.in
+++ b/package/luabitop/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 02/10] package/lua-compat53: depends on lua ABI 5.1

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua-compat53/Config.in | 2 +-
 package/lua-http/Config.in     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lua-compat53/Config.in b/package/lua-compat53/Config.in
index 76c5b3fd7..de468fcf6 100644
--- a/package/lua-compat53/Config.in
+++ b/package/lua-compat53/Config.in
@@ -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.
diff --git a/package/lua-http/Config.in b/package/lua-http/Config.in
index cbf71563b..8eefd481b 100644
--- a/package/lua-http/Config.in
+++ b/package/lua-http/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 03/10] lua: add 5.4.0 version

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/lua/5.4.0/0001-root-path.patch b/package/lua/5.4.0/0001-root-path.patch
new file mode 100644
index 000000000..588fecb12
--- /dev/null
+++ b/package/lua/5.4.0/0001-root-path.patch
@@ -0,0 +1,17 @@
+Adjust installation location to /usr.
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+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 "/"
+ 
diff --git a/package/lua/5.4.0/0002-shared-libs-for-lua.patch b/package/lua/5.4.0/0002-shared-libs-for-lua.patch
new file mode 100644
index 000000000..4ff204429
--- /dev/null
+++ b/package/lua/5.4.0/0002-shared-libs-for-lua.patch
@@ -0,0 +1,78 @@
+Add the compilation of a shared library.
+Compile the lua binary with the shared library.
+And install the shared library.
+The variable BUILDMODE allows to switch between static and dynamic mode.
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -42,6 +42,7 @@
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+ TO_LIB= liblua.a
++TO_SOLIB = liblua.so.$(R)
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -57,6 +58,8 @@
+ install: dummy
+ 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+ 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
++	test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :
++	test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+ 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+Index: b/src/Makefile
+===================================================================
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -33,6 +33,7 @@
+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO=	liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+@@ -44,8 +45,13 @@
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
++ifneq (dynamic,$(BUILDMODE))
+ ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++else
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
++endif
+ ALL_A= $(LUA_A)
++ALL_SO= $(LUA_SO)
+ 
+ # Targets start here.
+ default: $(PLAT)
+@@ -56,12 +62,23 @@
+ 
+ a:	$(ALL_A)
+ 
++so:	$(ALL_SO)
++
+ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
++	ln -fs $@.$(PKG_VERSION) $@
++
++ifneq (dynamic,$(BUILDMODE))
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++else
++$(LUA_T): $(LUA_O) $(LUA_SO)
++	$(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS)
++endif
+ 
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/package/lua/5.4.0/0011-linenoise.patch b/package/lua/5.4.0/0011-linenoise.patch
new file mode 100644
index 000000000..e842e5b1e
--- /dev/null
+++ b/package/lua/5.4.0/0011-linenoise.patch
@@ -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 <francois.perrad@gadz.org>
+
+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)
diff --git a/package/lua/Config.in b/package/lua/Config.in
index d6ddc708e..5d4cee5d5 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -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
diff --git a/package/lua/lua.hash b/package/lua/lua.hash
index 3e7812b7d..ab72480e5 100644
--- a/package/lua/lua.hash
+++ b/package/lua/lua.hash
@@ -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
 
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index ce75af6b0..ee604b612 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -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
 
diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in
index d35b35ff3..873fb345b 100644
--- a/package/luainterpreter/Config.in
+++ b/package/luainterpreter/Config.in
@@ -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"
diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
index 603c0851b..81a6cf208 100644
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -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
 
 ################################################################################
-- 
2.25.1

[Buildroot] [PATCH v3 04/10] package/lua-messagepack: add support of Lua 5.4

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua-messagepack/lua-messagepack.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk
index f393a8d02..33d460b4f 100644
--- a/package/lua-messagepack/lua-messagepack.mk
+++ b/package/lua-messagepack/lua-messagepack.mk
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 05/10] package/easybus: temporarily disabled with Lua 5.4

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/easydbus/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/easydbus/Config.in b/package/easydbus/Config.in
index 1fe8689cc..5f2f3a22b 100644
--- a/package/easydbus/Config.in
+++ b/package/easydbus/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 06/10] package/lua-cqueues: temporarily disabled with Lua 5.4

[Francois Perrad]

and its reverse dependency

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua-cqueues/Config.in | 5 +++--
 package/lua-http/Config.in    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/lua-cqueues/Config.in b/package/lua-cqueues/Config.in
index 60f022848..c319fbdf4 100644
--- a/package/lua-cqueues/Config.in
+++ b/package/lua-cqueues/Config.in
@@ -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
diff --git a/package/lua-http/Config.in b/package/lua-http/Config.in
index 8eefd481b..76eff7f29 100644
--- a/package/lua-http/Config.in
+++ b/package/lua-http/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 07/10] package/lua-flu: temporarily disabled with Lua 5.4

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua-flu/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/lua-flu/Config.in b/package/lua-flu/Config.in
index 526dc9008..9b55ce5ab 100644
--- a/package/lua-flu/Config.in
+++ b/package/lua-flu/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 08/10] package/lua-sdl2: temporarily disabled with Lua 5.4

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua-sdl2/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/lua-sdl2/Config.in b/package/lua-sdl2/Config.in
index 65f9e7ff4..d0c1b91eb 100644
--- a/package/lua-sdl2/Config.in
+++ b/package/lua-sdl2/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 09/10] package/luv: temporarily disabled with Lua 5.4

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/luv/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/luv/Config.in b/package/luv/Config.in
index 434cb3b45..3be204cab 100644
--- a/package/luv/Config.in
+++ b/package/luv/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 10/10] package/prosody: temporarily disabled with Lua 5.4

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/prosody/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/prosody/Config.in b/package/prosody/Config.in
index 4b7ea9425..d57da00a9 100644
--- a/package/prosody/Config.in
+++ b/package/prosody/Config.in
@@ -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
-- 
2.25.1

[Buildroot] [PATCH v3 07/10] package/lua-flu: temporarily disabled with Lua 5.4

[James Hilliard]

On Wed, Jul 29, 2020 at 12:35 PM Francois Perrad <fperrad@gmail.com> wrote:
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/lua-flu/Config.in | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/lua-flu/Config.in b/package/lua-flu/Config.in
> index 526dc9008..9b55ce5ab 100644
> --- a/package/lua-flu/Config.in
> +++ b/package/lua-flu/Config.in
> @@ -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
>         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
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 04/10] package/lua-messagepack: add support of Lua 5.4

[James Hilliard]

On Wed, Jul 29, 2020 at 12:35 PM Francois Perrad <fperrad@gmail.com> wrote:
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/lua-messagepack/lua-messagepack.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk
> index f393a8d02..33d460b4f 100644
> --- a/package/lua-messagepack/lua-messagepack.mk
> +++ b/package/lua-messagepack/lua-messagepack.mk
> @@ -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
>  LUA_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

[Buildroot] [PATCH v3 07/10] package/lua-flu: temporarily disabled with Lua 5.4

[François Perrad]

Le mer. 29 juil. 2020 ? 21:37, James Hilliard <james.hilliard1@gmail.com> a
?crit :

> On Wed, Jul 29, 2020 at 12:35 PM Francois Perrad <fperrad@gmail.com>
> wrote:
> >
> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> > ---
> >  package/lua-flu/Config.in | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/package/lua-flu/Config.in b/package/lua-flu/Config.in
> > index 526dc9008..9b55ce5ab 100644
> > --- a/package/lua-flu/Config.in
> > +++ b/package/lua-flu/Config.in
> > @@ -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
>

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


> >         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
> > --
> > 2.25.1
> >
> > _______________________________________________
> > 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>

[Buildroot] [PATCH v3 04/10] package/lua-messagepack: add support of Lua 5.4

[François Perrad]

Le mer. 29 juil. 2020 ? 21:40, James Hilliard <james.hilliard1@gmail.com> a
?crit :

> On Wed, Jul 29, 2020 at 12:35 PM Francois Perrad <fperrad@gmail.com>
> wrote:
> >
> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> > ---
> >  package/lua-messagepack/lua-messagepack.mk | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/package/lua-messagepack/lua-messagepack.mk
> b/package/lua-messagepack/lua-messagepack.mk
> > index f393a8d02..33d460b4f 100644
> > --- a/package/lua-messagepack/lua-messagepack.mk
> > +++ b/package/lua-messagepack/lua-messagepack.mk
> > @@ -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
>

There is only one use case, so overkill.
Lua is not gcc or Linux.

Fran?ois


> >  LUA_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
> _______________________________________________
> 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>

[Buildroot] [PATCH v3 00/10] Lua 5.4

[Thomas Petazzoni]

On Tue, 28 Jul 2020 15:21:37 +0200
Francois Perrad <fperrad@gmail.com> 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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com