package/solarus: depend on lua ABI version 5.1
authorJames Hilliard <james.hilliard1@gmail.com>
Mon, 25 May 2020 00:48:40 +0000 (18:48 -0600)
committerYann E. MORIN <yann.morin.1998@free.fr>
Mon, 27 Jul 2020 20:30:59 +0000 (22:30 +0200)
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

index 5d15342f3aa619ae4561b7f1c7d6fcc81972d1c7..cdff62687f89c473e5361aac72651df017ab968c 100644 (file)
@@ -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 \