* [Buildroot] [PATCH 01/11] lua: add 5.4.0 version
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-27 14:00 ` Thomas Petazzoni
2020-07-02 20:22 ` [Buildroot] [PATCH 02/11] package/luabitop: unsupport of Lua 5.4, as 5.3 Francois Perrad
` (10 subsequent siblings)
11 siblings, 1 reply; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
this new lua needs the same kind of patches as 5.1.5 or 5.3.5
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/pkg-luarocks.mk | 6 +-
7 files changed, 140 insertions(+), 5 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 ce2e439f6..81e9c84ef 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -24,13 +24,17 @@ config BR2_PACKAGE_LUA_5_1
config BR2_PACKAGE_LUA_5_3
bool "Lua 5.3.x"
+config BR2_PACKAGE_LUA_5_4
+ bool "Lua 5.4.x"
+
endchoice
config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
default "5.1" if BR2_PACKAGE_LUA_5_1
default "5.3" if BR2_PACKAGE_LUA_5_3
+ default "5.4" if BR2_PACKAGE_LUA_5_4
-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..0b6d2c1dc 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -4,15 +4,19 @@
#
################################################################################
+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
endif
+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,6 +26,10 @@ LUA_PROVIDES = luainterpreter
LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
+ifeq ($(BR2_PACKAGE_LUA_5_4),y)
+LUA_CFLAGS += -DLUA_COMPAT_5_3
+endif
+
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
LUA_CFLAGS += -DLUA_COMPAT_5_2
endif
diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
index 603c0851b..be85563ba 100644
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -20,9 +20,9 @@
LUAROCKS_RUN_CMD = $(HOST_DIR)/bin/luarocks
LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
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
+ifeq ($(BR2_PACKAGE_LUA_5_4),y)
+LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
+HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
endif
################################################################################
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 01/11] lua: add 5.4.0 version
2020-07-02 20:22 ` [Buildroot] [PATCH 01/11] lua: add 5.4.0 version Francois Perrad
@ 2020-07-27 14:00 ` Thomas Petazzoni
2020-07-27 16:59 ` François Perrad
0 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2020-07-27 14:00 UTC (permalink / raw)
To: buildroot
Hello Fran?ois,
Most issues are small details, except the last one, which really needs
a reply from you.
On Thu, 2 Jul 2020 22:22:20 +0200
Francois Perrad <fperrad@gmail.com> wrote:
> diff --git a/package/lua/lua.mk b/package/lua/lua.mk
> index ce75af6b0..0b6d2c1dc 100644
> --- a/package/lua/lua.mk
> +++ b/package/lua/lua.mk
> @@ -4,15 +4,19 @@
> #
> ################################################################################
>
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> +LUA_VERSION = 5.4.0
> +else
> ifeq ($(BR2_PACKAGE_LUA_5_3),y)
else ifeq
on one line...
> LUA_VERSION = 5.3.5
> else
> LUA_VERSION = 5.1.5
> endif
> +endif
... as it avoids the need for that additional 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,6 +26,10 @@ LUA_PROVIDES = luainterpreter
>
> LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
>
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> +LUA_CFLAGS += -DLUA_COMPAT_5_3
> +endif
> +
> ifeq ($(BR2_PACKAGE_LUA_5_3),y)
This could be changed to:
else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
> diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
> index 603c0851b..be85563ba 100644
> --- a/package/pkg-luarocks.mk
> +++ b/package/pkg-luarocks.mk
> @@ -20,9 +20,9 @@
> LUAROCKS_RUN_CMD = $(HOST_DIR)/bin/luarocks
> LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
> 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
I don't understand why this is being dropped. Could you clarify ?
> +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
> +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
> endif
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 01/11] lua: add 5.4.0 version
2020-07-27 14:00 ` Thomas Petazzoni
@ 2020-07-27 16:59 ` François Perrad
0 siblings, 0 replies; 17+ messages in thread
From: François Perrad @ 2020-07-27 16:59 UTC (permalink / raw)
To: buildroot
Le lun. 27 juil. 2020 ? 16:00, Thomas Petazzoni <
thomas.petazzoni@bootlin.com> a ?crit :
> Hello Fran?ois,
>
> Most issues are small details, except the last one, which really needs
> a reply from you.
>
> On Thu, 2 Jul 2020 22:22:20 +0200
> Francois Perrad <fperrad@gmail.com> wrote:
>
> > diff --git a/package/lua/lua.mk b/package/lua/lua.mk
> > index ce75af6b0..0b6d2c1dc 100644
> > --- a/package/lua/lua.mk
> > +++ b/package/lua/lua.mk
> > @@ -4,15 +4,19 @@
> > #
> >
> ################################################################################
> >
> > +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> > +LUA_VERSION = 5.4.0
> > +else
> > ifeq ($(BR2_PACKAGE_LUA_5_3),y)
>
> else ifeq
>
> on one line...
>
> > LUA_VERSION = 5.3.5
> > else
> > LUA_VERSION = 5.1.5
> > endif
> > +endif
>
> ... as it avoids the need for that additional 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,6 +26,10 @@ LUA_PROVIDES = luainterpreter
> >
> > LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
> >
> > +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> > +LUA_CFLAGS += -DLUA_COMPAT_5_3
> > +endif
> > +
> > ifeq ($(BR2_PACKAGE_LUA_5_3),y)
>
> This could be changed to:
>
> else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
>
> > diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
> > index 603c0851b..be85563ba 100644
> > --- a/package/pkg-luarocks.mk
> > +++ b/package/pkg-luarocks.mk
> > @@ -20,9 +20,9 @@
> > LUAROCKS_RUN_CMD = $(HOST_DIR)/bin/luarocks
> > LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
> > 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
>
> I don't understand why this is being dropped. Could you clarify ?
>
good catch!
>
> > +ifeq ($(BR2_PACKAGE_LUA_5_4),y)
> > +LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
> > +HOST_LUAROCKS_CFLAGS += -DLUA_COMPAT_5_3
> > endif
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> _______________________________________________
> 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/20200727/7083c2e1/attachment.html>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 02/11] package/luabitop: unsupport of Lua 5.4, as 5.3
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 01/11] lua: add 5.4.0 version Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 03/11] package/lua-compat53: " Francois Perrad
` (9 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/luabitop/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/luabitop/Config.in b/package/luabitop/Config.in
index a819fe8ae..51b12486d 100644
--- a/package/luabitop/Config.in
+++ b/package/luabitop/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LUABITOP
bool "luabitop"
- depends on !BR2_PACKAGE_LUA_5_3
+ depends on !BR2_PACKAGE_LUA_5_3 && !BR2_PACKAGE_LUA_5_4
help
Lua BitOp is a C extension module for Lua 5.1/5.2 which adds
bitwise operations on numbers.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LUABITOP
http://bitop.luajit.org
comment "luabitop needs a Lua 5.1/5.2 interpreter"
- depends on BR2_PACKAGE_LUA_5_3
+ depends on BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 03/11] package/lua-compat53: unsupport of Lua 5.4, as 5.3
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 01/11] lua: add 5.4.0 version Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 02/11] package/luabitop: unsupport of Lua 5.4, as 5.3 Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 04/11] package/prosody: " Francois Perrad
` (8 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
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..38a6b12f8 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_LUA_5_3 && !BR2_PACKAGE_LUA_5_4
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..19a77f107 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_LUA_5_3 && !BR2_PACKAGE_LUA_5_4 # runtime
select BR2_PACKAGE_LUA_CQUEUES # runtime
select BR2_PACKAGE_LUA_FIFO # runtime
select BR2_PACKAGE_LUA_LPEG_PATTERNS # runtime
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 04/11] package/prosody: unsupport of Lua 5.4, as 5.3
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (2 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 03/11] package/lua-compat53: " Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 05/11] package/lua-messagepack: add support of Lua 5.4 Francois Perrad
` (7 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/prosody/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/prosody/Config.in b/package/prosody/Config.in
index c32ca20e2..ca661bcc3 100644
--- a/package/prosody/Config.in
+++ b/package/prosody/Config.in
@@ -2,7 +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_3
+ depends on !BR2_PACKAGE_LUA_5_3 && !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
@@ -23,4 +23,4 @@ comment "prosody needs the lua interpreter, dynamic library"
depends on BR2_USE_MMU
comment "prosody needs a Lua 5.1/5.2 interpreter"
- depends on BR2_PACKAGE_LUA_5_3
+ depends on BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 05/11] package/lua-messagepack: add support of Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (3 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 04/11] package/prosody: " Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 06/11] package/luaossl: " Francois Perrad
` (6 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 06/11] package/luaossl: add support of Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (4 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 05/11] package/lua-messagepack: add support of Lua 5.4 Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-10 15:31 ` François Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 07/11] package/easybus: temporarily disabled with " Francois Perrad
` (5 subsequent siblings)
11 siblings, 1 reply; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/luaossl/0001-add-support-Lua54.patch | 25 ++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 package/luaossl/0001-add-support-Lua54.patch
diff --git a/package/luaossl/0001-add-support-Lua54.patch b/package/luaossl/0001-add-support-Lua54.patch
new file mode 100644
index 000000000..9dd9bddb8
--- /dev/null
+++ b/package/luaossl/0001-add-support-Lua54.patch
@@ -0,0 +1,25 @@
+add support of Lua 5.4
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+diff --git a/vendor/compat53/c-api/compat-5.3.h b/vendor/compat53/c-api/compat-5.3.h
+index 8e10893..4f8e58e 100644
+--- a/luaossl-rel-20190731/vendor/compat53/c-api/compat-5.3.h
++++ b/luaossl-rel-20190731/vendor/compat53/c-api/compat-5.3.h
+@@ -397,11 +397,11 @@
+
+
+ /* other Lua versions */
+-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 503
++#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
+
+-# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)"
++# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3 or 5.4)"
+
+-#endif /* other Lua versions except 5.1, 5.2, and 5.3 */
++#endif /* other Lua versions except 5.1, 5.2, 5.3 and 5.4 */
+
+
+
+--
+
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 06/11] package/luaossl: add support of Lua 5.4
2020-07-02 20:22 ` [Buildroot] [PATCH 06/11] package/luaossl: " Francois Perrad
@ 2020-07-10 15:31 ` François Perrad
0 siblings, 0 replies; 17+ messages in thread
From: François Perrad @ 2020-07-10 15:31 UTC (permalink / raw)
To: buildroot
Le ven. 3 juil. 2020 ? 08:58, Francois Perrad <fperrad@gmail.com> a ?crit :
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>
it becomes useless after the bump to version 20200709
see https://patchwork.ozlabs.org/project/buildroot/list/?series=188712
Fran?ois
> ---
> package/luaossl/0001-add-support-Lua54.patch | 25 ++++++++++++++++++++
> 1 file changed, 25 insertions(+)
> create mode 100644 package/luaossl/0001-add-support-Lua54.patch
>
> diff --git a/package/luaossl/0001-add-support-Lua54.patch
> b/package/luaossl/0001-add-support-Lua54.patch
> new file mode 100644
> index 000000000..9dd9bddb8
> --- /dev/null
> +++ b/package/luaossl/0001-add-support-Lua54.patch
> @@ -0,0 +1,25 @@
> +add support of Lua 5.4
> +
> +Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> +
> +diff --git a/vendor/compat53/c-api/compat-5.3.h
> b/vendor/compat53/c-api/compat-5.3.h
> +index 8e10893..4f8e58e 100644
> +--- a/luaossl-rel-20190731/vendor/compat53/c-api/compat-5.3.h
> ++++ b/luaossl-rel-20190731/vendor/compat53/c-api/compat-5.3.h
> +@@ -397,11 +397,11 @@
> +
> +
> + /* other Lua versions */
> +-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 ||
> LUA_VERSION_NUM > 503
> ++#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 ||
> LUA_VERSION_NUM > 504
> +
> +-# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)"
> ++# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3 or 5.4)"
> +
> +-#endif /* other Lua versions except 5.1, 5.2, and 5.3 */
> ++#endif /* other Lua versions except 5.1, 5.2, 5.3 and 5.4 */
> +
> +
> +
> +--
> +
> --
> 2.25.1
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200710/a1ffe9ae/attachment.html>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 07/11] package/easybus: temporarily disabled with Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (5 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 06/11] package/luaossl: " Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-27 14:04 ` Thomas Petazzoni
2020-07-02 20:22 ` [Buildroot] [PATCH 08/11] package/lua-cqueues: " Francois Perrad
` (4 subsequent siblings)
11 siblings, 1 reply; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/easydbus/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/easydbus/Config.in b/package/easydbus/Config.in
index 1fe8689cc..ae0dbf2b5 100644
--- a/package/easydbus/Config.in
+++ b/package/easydbus/Config.in
@@ -3,6 +3,7 @@ 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.
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 07/11] package/easybus: temporarily disabled with Lua 5.4
2020-07-02 20:22 ` [Buildroot] [PATCH 07/11] package/easybus: temporarily disabled with " Francois Perrad
@ 2020-07-27 14:04 ` Thomas Petazzoni
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2020-07-27 14:04 UTC (permalink / raw)
To: buildroot
On Thu, 2 Jul 2020 22:22:26 +0200
Francois Perrad <fperrad@gmail.com> wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/easydbus/Config.in | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/easydbus/Config.in b/package/easydbus/Config.in
> index 1fe8689cc..ae0dbf2b5 100644
> --- a/package/easydbus/Config.in
> +++ b/package/easydbus/Config.in
> @@ -3,6 +3,7 @@ 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.
The Config.in comment also needs to be updated:
comment "easydbus needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
and this is true also for many of your other patches in this series.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 08/11] package/lua-cqueues: temporarily disabled with Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (6 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 07/11] package/easybus: temporarily disabled with " Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 09/11] package/lua-flu: " Francois Perrad
` (3 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
and its reverse dependency
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/lua-cqueues/Config.in | 1 +
package/lua-http/Config.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/package/lua-cqueues/Config.in b/package/lua-cqueues/Config.in
index 60f022848..de2aa4692 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,
diff --git a/package/lua-http/Config.in b/package/lua-http/Config.in
index 19a77f107..bf1129901 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
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 09/11] package/lua-flu: temporarily disabled with Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (7 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 08/11] package/lua-cqueues: " Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 10/11] package/lua-sdl2: " Francois Perrad
` (2 subsequent siblings)
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/lua-flu/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/lua-flu/Config.in b/package/lua-flu/Config.in
index 526dc9008..434271eed 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
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 10/11] package/lua-sdl2: temporarily disabled with Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (8 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 09/11] package/lua-flu: " Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-02 20:22 ` [Buildroot] [PATCH 11/11] package/luv: " Francois Perrad
2020-07-25 20:42 ` [Buildroot] [PATCH 00/11] " Thomas Petazzoni
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/lua-sdl2/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/lua-sdl2/Config.in b/package/lua-sdl2/Config.in
index 65f9e7ff4..faf1fa853 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,
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 11/11] package/luv: temporarily disabled with Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (9 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 10/11] package/lua-sdl2: " Francois Perrad
@ 2020-07-02 20:22 ` Francois Perrad
2020-07-25 20:42 ` [Buildroot] [PATCH 00/11] " Thomas Petazzoni
11 siblings, 0 replies; 17+ messages in thread
From: Francois Perrad @ 2020-07-02 20:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/luv/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/luv/Config.in b/package/luv/Config.in
index 434cb3b45..1be189977 100644
--- a/package/luv/Config.in
+++ b/package/luv/Config.in
@@ -4,6 +4,7 @@ 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.
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 00/11] Lua 5.4
2020-07-02 20:22 [Buildroot] [PATCH 00/11] Lua 5.4 Francois Perrad
` (10 preceding siblings ...)
2020-07-02 20:22 ` [Buildroot] [PATCH 11/11] package/luv: " Francois Perrad
@ 2020-07-25 20:42 ` Thomas Petazzoni
11 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2020-07-25 20:42 UTC (permalink / raw)
To: buildroot
Hello Fran?ois,
On Thu, 2 Jul 2020 22:22:19 +0200
Francois Perrad <fperrad@gmail.com> wrote:
> This pacthset introduces Lua 5.4 serie.
Thanks for this patch series. Could you review the patch series from
James about Lua at
https://patchwork.ozlabs.org/project/buildroot/list/?series=178989.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 17+ messages in thread