gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Francois Perrad 2014-07-19 16:38:57 +02:00 committed by Thomas Petazzoni
parent f93de3fb20
commit 513b1b9b75
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/luainterpreter/luainterpreter.mk
View File

@ -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))

18
package/luarocks/luarocks.mk
View File

@ -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
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 \
--prefix=$(HOST_DIR)/usr \
--sysconfdir=$(LUAROCKS_CONFIG_DIR) \
--with-lua=$(HOST_DIR)/usr
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