* [Buildroot] [PATCH 1/9 v2] package/efl: depend on LuaJIT
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 2/9 v2] package/minetest: " Yann E. MORIN
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
Luajit is a provider for luainterpreter. We can't select providers of
virtual packages; we can only depend on them.
Note also that it is not very clear whether the host and target variants
of EFL need to be built with the same lua interpreter. Today, this is
guaranteed as we inly use luajit in both cases. But there were issues
with lua 5.1 in the past, so stick to only using luajit.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[yann.morin.1998 at free.fr:
- depend on luajit, not "any" luainterpreter
- which keeps the host and target variants built with the same
interpreter
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/efl/Config.in | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/package/efl/Config.in b/package/efl/Config.in
index ff49161163..728032018b 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -3,17 +3,16 @@ config BR2_PACKAGE_EFL
# g++ issue with 4.4.5, tested with g++ 4.7.2
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit
depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads
depends on BR2_USE_MMU
depends on BR2_USE_WCHAR # use wchar_t
depends on !BR2_STATIC_LIBS # dlfcn.h
+ # https://phab.enlightenment.org/T2728
+ depends on BR2_PACKAGE_LUAJIT
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_JPEG # Emile needs libjpeg
select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency
- # https://phab.enlightenment.org/T2728
- select BR2_PACKAGE_LUAJIT # Lua support broken
select BR2_PACKAGE_LZ4
select BR2_PACKAGE_ZLIB
help
@@ -306,5 +305,4 @@ comment "efl needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wch
depends on !BR2_INSTALL_LIBSTDCPP \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
depends on BR2_USE_MMU
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 2/9 v2] package/minetest: depend on LuaJIT
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 1/9 v2] package/efl: depend on LuaJIT Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 3/9 v2] package/prosody: don't depend on !lua 5.3 Yann E. MORIN
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
Luajit is a provider for luainterpreter. We can't select providers of
virtual packages; we can only depend on them.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[yann.morin.1998 at free.fr:
- a lua interpreter is needed, so don't drop the dependency
- make it a "depends on" rather than a "select"
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/minetest/Config.in | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/package/minetest/Config.in b/package/minetest/Config.in
index 085525534d..b8ee175d52 100644
--- a/package/minetest/Config.in
+++ b/package/minetest/Config.in
@@ -5,11 +5,10 @@ config BR2_PACKAGE_MINETEST
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_XORG7 # irrlicht
depends on BR2_PACKAGE_HAS_LIBGL # irrlicht
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_LUAJIT
select BR2_PACKAGE_IRRLICHT
select BR2_PACKAGE_GMP
select BR2_PACKAGE_JSONCPP
- select BR2_PACKAGE_LUAJIT
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_ZLIB
# At least one option must be enabled
@@ -59,7 +58,6 @@ comment "minetest needs a toolchain w/ C++, gcc >= 4.9, threads"
|| !BR2_TOOLCHAIN_HAS_THREADS
comment "minetest needs X11 and an OpenGL provider"
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
depends on (BR2_INSTALL_LIBSTDCPP \
&& BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
&& BR2_TOOLCHAIN_HAS_THREADS)
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 3/9 v2] package/prosody: don't depend on !lua 5.3
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 1/9 v2] package/efl: depend on LuaJIT Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 2/9 v2] package/minetest: " Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 4/9 v2] package/luainterpreter: add abi version options Yann E. MORIN
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
The current version of prosody is compatible with Lua 5.3.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/prosody/Config.in | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/prosody/Config.in b/package/prosody/Config.in
index c32ca20e23..4b7ea94256 100644
--- a/package/prosody/Config.in
+++ b/package/prosody/Config.in
@@ -2,7 +2,6 @@ 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
@@ -21,6 +20,3 @@ 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
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 4/9 v2] package/luainterpreter: add abi version options
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
` (2 preceding siblings ...)
2020-07-27 20:32 ` [Buildroot] [PATCH 3/9 v2] package/prosody: don't depend on !lua 5.3 Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 5/9 v2] package/luainterpreter: gather the ABI version string defaults Yann E. MORIN
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
Since a number of packages depend on specific ABI version that are
provided by lua and luajit packages we should have a kconfig variable
that those packages can depend on.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/lua/Config.in | 2 ++
package/luainterpreter/Config.in | 6 ++++++
package/luajit/Config.in | 1 +
3 files changed, 9 insertions(+)
diff --git a/package/lua/Config.in b/package/lua/Config.in
index ce2e439f63..c267cb6faf 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -20,9 +20,11 @@ choice
config BR2_PACKAGE_LUA_5_1
bool "Lua 5.1.x"
+ select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
config BR2_PACKAGE_LUA_5_3
bool "Lua 5.3.x"
+ select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3
endchoice
diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in
index 7bc54d862f..a5973063b4 100644
--- a/package/luainterpreter/Config.in
+++ b/package/luainterpreter/Config.in
@@ -8,6 +8,12 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
string
+config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
+ bool
+
+config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_3
+ bool
+
config BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER
string
default "host-lua"
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index f4d6001586..8cfa85684e 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -19,6 +19,7 @@ config BR2_PACKAGE_LUAJIT
# binaries, so check if that option is supported. See
# luajit.mk for details.
select BR2_PACKAGE_HAS_LUAINTERPRETER
+ select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64
help
LuaJIT implements the full set of language features defined
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 5/9 v2] package/luainterpreter: gather the ABI version string defaults
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
` (3 preceding siblings ...)
2020-07-27 20:32 ` [Buildroot] [PATCH 4/9 v2] package/luainterpreter: add abi version options Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 6/9 v2] package/sysdig: depend on lua ABI version 5.1 Yann E. MORIN
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
Now that we have booleans to represent the Lua ABI version, and that
every Lua providers do select those, there is no longer any reason
for them to also handle the ABI version string anymore.
Move the defaults into the common luainterpreter.
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: James Hilliard <james.hilliard1@gmail.com>
Cc: Francois Perrad <francois.perrad@gadz.org>
---
package/lua/Config.in | 4 ----
package/luainterpreter/Config.in | 2 ++
package/luajit/Config.in | 3 ---
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/package/lua/Config.in b/package/lua/Config.in
index c267cb6faf..d6ddc708e7 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -28,10 +28,6 @@ config BR2_PACKAGE_LUA_5_3
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
-
if BR2_PACKAGE_LUA_5_3
config BR2_PACKAGE_LUA_32BITS
bool "Use 32 bit numbers"
diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in
index a5973063b4..d35b35ff31 100644
--- a/package/luainterpreter/Config.in
+++ b/package/luainterpreter/Config.in
@@ -7,6 +7,8 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
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
config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
bool
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index 8cfa85684e..eb3eb01998 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -34,9 +34,6 @@ if BR2_PACKAGE_LUAJIT
config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
default "luajit"
-config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
- default "5.1"
-
config BR2_PACKAGE_LUAJIT_COMPAT52
bool "Lua 5.2 compatibility"
help
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 6/9 v2] package/sysdig: depend on lua ABI version 5.1
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
` (4 preceding siblings ...)
2020-07-27 20:32 ` [Buildroot] [PATCH 5/9 v2] package/luainterpreter: gather the ABI version string defaults Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 7/9 v2] package/collectd: depend on luainterpreter for lua support Yann E. MORIN
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
Since sysdig is compatible with lua interpreters that provide the
version 5.1 ABI we should depend on that instead of unconditionally
selecting luajit.
Use luainterpreter as the dependency, now that either lua or luajit
can be used.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[yann.morin.1998 at free.fr:
- reorder dependencies in Config.in: package deps go after toolchain
deps
- keep the toolchain deps together in the comment
- switch to using luainterpreter as a build dependency
- split the now-long _DEPENDENCIES list
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/sysdig/Config.in | 11 +++++------
package/sysdig/sysdig.mk | 13 ++++++++++++-
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in
index ee53b4fa20..0ca468c396 100644
--- a/package/sysdig/Config.in
+++ b/package/sysdig/Config.in
@@ -2,18 +2,17 @@ config BR2_PACKAGE_SYSDIG
bool "sysdig"
depends on BR2_LINUX_KERNEL
depends on BR2_INSTALL_LIBSTDCPP # libjson
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
depends on BR2_TOOLCHAIN_HAS_THREADS # jq
- depends on !BR2_STATIC_LIBS # luajit, elfutils
+ depends on !BR2_STATIC_LIBS # elfutils
depends on BR2_USE_WCHAR # elfutils
depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
+ depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
select BR2_PACKAGE_ELFUTILS
select BR2_PACKAGE_JQ
select BR2_PACKAGE_JSONCPP
select BR2_PACKAGE_LIBB64
select BR2_PACKAGE_LIBCURL
- select BR2_PACKAGE_LUAJIT
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_ZLIB
@@ -26,9 +25,9 @@ config BR2_PACKAGE_SYSDIG
https://github.com/draios/sysdig/wiki
-comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library and a Linux kernel to be built"
+comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built"
depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \
|| !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \
- || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \
+ || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk
index c604032cf4..9c8b818181 100644
--- a/package/sysdig/sysdig.mk
+++ b/package/sysdig/sysdig.mk
@@ -9,9 +9,20 @@ SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
SYSDIG_LICENSE = GPL-2.0
SYSDIG_LICENSE_FILES = COPYING
SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF
-SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64 elfutils
SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO
+SYSDIG_DEPENDENCIES = \
+ elfutils \
+ jq \
+ jsoncpp \
+ libb64 \
+ libcurl \
+ luainterpreter \
+ ncurses \
+ openssl \
+ zlib \
+
+
# sysdig creates the module Makefile from a template, which contains a
# single place-holder, KBUILD_FLAGS, wich is only replaced with two
# things:
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 7/9 v2] package/collectd: depend on luainterpreter for lua support
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
` (5 preceding siblings ...)
2020-07-27 20:32 ` [Buildroot] [PATCH 6/9 v2] package/sysdig: depend on lua ABI version 5.1 Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:32 ` [Buildroot] [PATCH 8/9 v2] package/solarus: depend on lua ABI version 5.1 Yann E. MORIN
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
Since collectd lua support is compatible with any luainterpreter
implementation we should depend on BR2_PACKAGE_HAS_LUAINTERPRETER
instead of unconditionally selecting BR2_PACKAGE_LUA.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[yann.morin.1998 at free.fr: use luainterpreter as dependency]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/collectd/Config.in | 5 ++++-
package/collectd/collectd.mk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 188be3c0fb..276ad17329 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -65,11 +65,14 @@ config BR2_PACKAGE_COLLECTD_LOGSTASH
config BR2_PACKAGE_COLLECTD_LUA
bool "lua"
- select BR2_PACKAGE_LUA
+ depends on BR2_PACKAGE_HAS_LUAINTERPRETER
help
Embeds a Lua interpreter into collectd and provides an
interface to collectd's plugin system.
+comment "lua support needs a Lua interpreter"
+ depends on !BR2_PACKAGE_HAS_LUAINTERPRETER
+
config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL
bool "notify_email"
depends on !BR2_STATIC_LIBS # libesmtp
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 24cdad7e1b..6d084dbe42 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -160,7 +160,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \
- $(if $(BR2_PACKAGE_COLLECTD_LUA),lua) \
+ $(if $(BR2_PACKAGE_COLLECTD_LUA),luainterpreter) \
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \
$(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \
$(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 8/9 v2] package/solarus: depend on lua ABI version 5.1
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
` (6 preceding siblings ...)
2020-07-27 20:32 ` [Buildroot] [PATCH 7/9 v2] package/collectd: depend on luainterpreter for lua support Yann E. MORIN
@ 2020-07-27 20:32 ` Yann E. MORIN
2020-07-27 20:33 ` [Buildroot] [PATCH 9/9 v2] package/luaposix: select bit32 based " Yann E. MORIN
2020-07-27 20:39 ` [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:32 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
Since solarus is compatible with lua interpreters that provide the
version 5.1 ABI we should depend on that instead of unconditionally
selecting luajit.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/solarus/Config.in | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/package/solarus/Config.in b/package/solarus/Config.in
index 5d15342f3a..cdff62687f 100644
--- a/package/solarus/Config.in
+++ b/package/solarus/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_SOLARUS
bool "solarus"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
@@ -12,7 +12,6 @@ config BR2_PACKAGE_SOLARUS
select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_LIBPNG # runtime
select BR2_PACKAGE_LIBVORBIS
- select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1
select BR2_PACKAGE_OPENAL
select BR2_PACKAGE_PHYSFS
select BR2_PACKAGE_SDL2
@@ -26,8 +25,8 @@ config BR2_PACKAGE_SOLARUS
http://www.solarus-games.org
https://github.com/solarus-games/solarus
-comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
- depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS || BR2_PACKAGE_LUA_5_1
+comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library, and luajit or lua 5.1"
+ depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 9/9 v2] package/luaposix: select bit32 based on lua ABI version 5.1
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
` (7 preceding siblings ...)
2020-07-27 20:32 ` [Buildroot] [PATCH 8/9 v2] package/solarus: depend on lua ABI version 5.1 Yann E. MORIN
@ 2020-07-27 20:33 ` Yann E. MORIN
2020-07-27 20:39 ` [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:33 UTC (permalink / raw)
To: buildroot
From: James Hilliard <james.hilliard1@gmail.com>
Since the bit32 module is needed by all lua ABI 5.1 providers we can
select based on the lua ABI version instead of both lua 5.1 and luajit.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/luaposix/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in
index cedb3a6654..85943f9915 100644
--- a/package/luaposix/Config.in
+++ b/package/luaposix/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LUAPOSIX
# "bit32" is included in Lua 5.2+. luajit has an equivalent
# "bit" module, but since it has a different name, luaposix
# doesn't find it.
- select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT # runtime
+ select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime
help
This is a POSIX binding for LuaJIT, Lua 5.1 through 5.4;
like most libraries it simply binds to C APIs on the
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi)
2020-07-27 20:32 [Buildroot] [PATCH 0/9 v2] pacakge/lua: introduce ABI versions (branch yem/lua-abi) Yann E. MORIN
` (8 preceding siblings ...)
2020-07-27 20:33 ` [Buildroot] [PATCH 9/9 v2] package/luaposix: select bit32 based " Yann E. MORIN
@ 2020-07-27 20:39 ` Yann E. MORIN
9 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2020-07-27 20:39 UTC (permalink / raw)
To: buildroot
All,
On 2020-07-27 22:32 +0200, Yann E. MORIN spake thusly:
> This is a respin of the initial series by James, slighlty massaged by me
> to account for the various feedbacks in the initial iteration.
After a quick round on IRC, applied on master, thanks!
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 11+ messages in thread