Commit 513b1b9b authored by Francois Perrad's avatar Francois Perrad Committed by Thomas Petazzoni
Browse files

luarocks: allow to work with host-luainterpreter 



when we embed luajit on target,
we use luarocks with host-luajit instead of host-lua,
in order to use the same interpreter on the both side.

Signed-off-by: default avatarFrancois Perrad <francois.perrad@gadz.org>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent f93de3fb

package/luainterpreter/luainterpreter.mk

+2 −0
Original line number Diff line number Diff line
@@ -8,3 +8,5 @@ LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION)) 


$(eval $(virtual-package))

$(eval $(host-virtual-package))



LUA_RUN = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER))

package/luarocks/luarocks.mk

+12 −6
Original line number Diff line number Diff line
@@ -9,16 +9,22 @@ LUAROCKS_SITE = http://luarocks.org/releases/ 
LUAROCKS_LICENSE = MIT

LUAROCKS_LICENSE_FILES = COPYING



HOST_LUAROCKS_DEPENDENCIES = host-lua

HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter



LUAROCKS_CONFIG_DIR  = $(HOST_DIR)/usr/etc/luarocks

LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua



define HOST_LUAROCKS_CONFIGURE_CMDS

	cd $(@D) && ./configure \

HOST_LUAROCKS_CONF_OPT = \

	--prefix=$(HOST_DIR)/usr \

	--sysconfdir=$(LUAROCKS_CONFIG_DIR) \

	--with-lua=$(HOST_DIR)/usr



ifeq ($(BR2_PACKAGE_LUAJIT),y)

HOST_LUAROCKS_CONF_OPT += --lua-suffix=jit

endif



define HOST_LUAROCKS_CONFIGURE_CMDS

	cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPT)

endef



define HOST_LUAROCKS_INSTALL_CMDS
@@ -44,4 +50,4 @@ endef 
$(eval $(host-generic-package))



LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \

	$(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks
 
	$(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks