diff --git a/package/lua-cffi/Config.in b/package/lua-cffi/Config.in index f4a760ce0d..ceef16ee6f 100644 --- a/package/lua-cffi/Config.in +++ b/package/lua-cffi/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LUA_CFFI bool "lua-cffi" - depends on !BR2_PACKAGE_LUAJIT depends on BR2_TOOLCHAIN_HAS_THREADS # libffi depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP @@ -13,7 +12,6 @@ config BR2_PACKAGE_LUA_CFFI https://github.com/q66/cffi-lua comment "lua-cffi needs a toolchain w/ C++, gcc >= 4.8, threads" - depends on !BR2_PACKAGE_LUAJIT depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index 30427ac34c..f0127b335a 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -9,6 +9,14 @@ LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md -LUA_CFFI_DEPENDENCIES = libffi lua +LUA_CFFI_DEPENDENCIES = libffi + +ifeq ($(BR2_PACKAGE_LUA),y) +LUA_CFFI_DEPENDENCIES += lua +LUA_CFFI_CONF_OPTS += -Dlua_version=$(LUAINTERPRETER_ABIVER) +else ifeq ($(BR2_PACKAGE_LUAJIT),y) +LUA_CFFI_DEPENDENCIES += luajit +LUA_CFFI_CONF_OPTS += -Dlua_version=luajit +endif $(eval $(meson-package))