diff options
| -rw-r--r-- | package/luarocks/luarocks.mk | 4 | ||||
| -rw-r--r-- | package/pkg-luarocks.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 2b6c9753a3..ccbaaf7947 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -53,8 +53,8 @@ endef $(eval $(host-generic-package)) -LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ - $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks +LUAROCKS_RUN_ENV = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" +LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks define LUAROCKS_FINALIZE_TARGET rm -rf $(TARGET_DIR)/usr/lib/luarocks diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk index 83f338efd5..da5c912c81 100644 --- a/package/pkg-luarocks.mk +++ b/package/pkg-luarocks.mk @@ -49,7 +49,7 @@ $(2)_DEPENDENCIES += host-luarocks luainterpreter ifndef $(2)_EXTRACT_CMDS define $(2)_EXTRACT_CMDS cd $$($(2)_DIR)/.. && \ - $$(LUAROCKS_RUN) unpack --force $$(DL_DIR)/$$($(2)_SOURCE) + $$(LUAROCKS_RUN_ENV) $$(LUAROCKS_RUN_CMD) unpack --force $$(DL_DIR)/$$($(2)_SOURCE) endef endif @@ -58,8 +58,8 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$($(2)_SRCDIR) && \ - $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) + cd $$($(2)_SRCDIR) && $$(LUAROCKS_RUN_ENV) flock $$(TARGET_DIR) \ + $$(LUAROCKS_RUN_CMD) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) endef endif |
