Commit 22b327fc authored by Fabio Porcedda's avatar Fabio Porcedda Committed by Thomas Petazzoni
Browse files

pkg-luarocks: fix top-level parallel makefile support 



In the *-install-target phase the manifest file is being updated, if multiply packages try to update it they fail.

To avoid multiple access to the manifest file use flock to sync
multiple luarocks packages.

e.g. installing three luarocks packages:
make lua-cjson-build lua-coat-build lua-coatpersistent-build
make lua-cjson lua-coat lua-coatpersistent -j

Fix error:
Updating manifest for /home/tetsuya/buildroot/br2/output/target/usr/lib/luarocks/rocks
No existing manifest. Attempting to rebuild...

Error: rock_manifest file not found for lua-coat 0.9.1-1 - not a LuaRocks 2 tree?

[Thomas: get rid of LUAROCKS_RUN, and use LUAROCKS_RUN_ENV +
LUAROCKS_RUN_CMD everywhere.]

Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1668e1da

package/luarocks/luarocks.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

package/pkg-luarocks.mk

+3 −3
Original line number Diff line number Diff line
@@ -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