| Message ID | 20240523162148.1468596-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/lua-cffi: add luajit support | expand |
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > luajit is supported since the addition of the package in commit > 13114d0f9352531e5d7ebed45cd3f679407c61d9 and > https://github.com/q66/cffi-lua/commit/cb92c44e781d81e31eb7fe21911b01e54a2c3893 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed, thanks.
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > luajit is supported since the addition of the package in commit > 13114d0f9352531e5d7ebed45cd3f679407c61d9 and > https://github.com/q66/cffi-lua/commit/cb92c44e781d81e31eb7fe21911b01e54a2c3893 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/lua-cffi/Config.in | 2 -- > package/lua-cffi/lua-cffi.mk | 10 +++++++++- > 2 files changed, 9 insertions(+), 3 deletions(-) > 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..d6e059d273 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 FYI, I made these += to get rid of a warning from check-package: package/lua-cffi/lua-cffi.mk:16: conditional override of variable LUA_CFFI_CONF_OPTS package/lua-cffi/lua-cffi.mk:19: conditional override of variable LUA_CFFI_CONF_OPTS
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..d6e059d273 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))
luajit is supported since the addition of the package in commit 13114d0f9352531e5d7ebed45cd3f679407c61d9 and https://github.com/q66/cffi-lua/commit/cb92c44e781d81e31eb7fe21911b01e54a2c3893 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/lua-cffi/Config.in | 2 -- package/lua-cffi/lua-cffi.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-)