diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 0ac2e0e25d..851dc8f734 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -16,10 +16,10 @@ endif LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -LUA_LICENSE_FILES = COPYRIGHT -else +ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y) LUA_LICENSE_FILES = doc/readme.html +else +LUA_LICENSE_FILES = COPYRIGHT endif LUA_PROVIDES = luainterpreter diff --git a/package/luainterpreter/Config.in b/package/luainterpreter/Config.in index e89a9b84d2..7bc54d862f 100644 --- a/package/luainterpreter/Config.in +++ b/package/luainterpreter/Config.in @@ -7,3 +7,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION string + +config BR2_PACKAGE_PROVIDES_HOST_LUAINTERPRETER + string + default "host-lua" diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk index cb1d5dde18..58d421b183 100644 --- a/package/luainterpreter/luainterpreter.mk +++ b/package/luainterpreter/luainterpreter.mk @@ -20,4 +20,4 @@ endif $(eval $(virtual-package)) $(eval $(host-virtual-package)) -LUA_RUN = $(HOST_DIR)/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER)) +LUA_RUN = $(HOST_DIR)/bin/lua diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 389d521832..63d908a416 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -23,10 +23,6 @@ HOST_LUAROCKS_CONF_OPTS = \ --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ --with-lua=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_LUAJIT),y) -HOST_LUAROCKS_CONF_OPTS += --lua-suffix=jit -endif - define HOST_LUAROCKS_CONFIGURE_CMDS cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS) endef