aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-11-16 14:53:00 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-11-16 20:25:25 +0100
commit7d47af583c742b66d3578642653a5b61b514bb6d (patch)
treed5c39ae11a5e656ae37c69ce39de71fe2afd37d0
parente4076e407ac61d8d8df4dec154d62ba186ec003f (diff)
downloadbuildroot-7d47af583c742b66d3578642653a5b61b514bb6d.tar.gz
buildroot-7d47af583c742b66d3578642653a5b61b514bb6d.tar.bz2
package/pkg-luarocks: use <pkg>_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 <pkg>_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 <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni &lt;<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>&gt;<br> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pkg-luarocks.mk7
1 files 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
################################################################################