[Buildroot] [PATCH 8/9 v2] package/solarus: depend on lua ABI version 5.1
Yann E. MORIN
yann.morin.1998 at free.fr
Mon Jul 27 20:32:59 UTC 2020
From: James Hilliard <james.hilliard1 at 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 at gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at 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
More information about the buildroot
mailing list