From 7d47af583c742b66d3578642653a5b61b514bb6d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 16 Nov 2018 14:53:00 +0100 Subject: [PATCH] package/pkg-luarocks: use _EXTRACT_DEPENDENCIES The host luarocks tool is needed when *extracting* luarocks packages. Since regular dependencies are only available at the configure step, it caused the "luarocks" program to be available too late to be used to extract luarocks packages. To work around this, host-luarocks was manually added as a dependency of the extract step of luarocks packages. While this worked fine until now, it breaks badly with per-package folders, because host-luarocks is not recorded as an extract dependency of luarocks packages, and therefore is not copied to the per-package host folder, causing a failure. In the mean time, the _EXTRACT_DEPENDENCIES mechanism was added, which aims at fixing exactly this problem, so let's use it and simplify pkg-luarocks.mk. Cc: Francois Perrad Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Acked-by: Francois Perrad Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Peter Korsgaard --- package/pkg-luarocks.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk index e2b48cfb4c..29c5e66cd1 100644 --- a/package/pkg-luarocks.mk +++ b/package/pkg-luarocks.mk @@ -42,7 +42,8 @@ $(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR)) # Since we do not support host-luarocks-package, we know this is # a target package, and can just add the required dependencies -$(2)_DEPENDENCIES += host-luarocks luainterpreter +$(2)_DEPENDENCIES += luainterpreter +$(2)_EXTRACT_DEPENDENCIES += host-luarocks # # Extract step. Extract into a temporary dir and move the relevant part to the @@ -71,10 +72,6 @@ endif # make targets $(call inner-generic-package,$(1),$(2),$(3),$(4)) -# $(2)_DEPENDENCIES are handled for configure step (too late) -# but host-luarocks is required to do the extract -$$($(2)_TARGET_EXTRACT): | host-luarocks - endef ################################################################################ -- 2.30.2