From e298cf06f6fe04bf6b52bddeee1a816054195ac4 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 23 Dec 2016 20:50:55 -0500 Subject: [PATCH] luarocks: fix target-finalize hook processing The LUAROCKS_TARGET_FINALIZE_HOOKS is not running, so detritus is being left in /usr/lib/luarocks. This is because host-luarocks is built by being a dependency in the luarocks package infrastructure, not by being selected by kconfig symbol. This means that the $(PKG)_KCONFIG_VAR in pkg-generic.mk is not met, and (HOST_)LUAROCKS_TARGET_FINALIZE_HOOKS is not added to the global TARGET_FINALIZE_HOOKS. This mod fixes this issue by adding the host-luarocks hook directly to TARGET_FINALIZE_HOOKS when either lua or luajit is enabled. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/luarocks/luarocks.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 4e0d537ff7..d18056a527 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -60,4 +60,7 @@ define LUAROCKS_FINALIZE_TARGET rm -rf $(TARGET_DIR)/usr/lib/luarocks endef -LUAROCKS_TARGET_FINALIZE_HOOKS += LUAROCKS_FINALIZE_TARGET +# Apply to global variable directly, as pkg-generic does not +ifneq ($(BR2_PACKAGE_LUAJIT)$(BR2_PACKAGE_LUA),) +TARGET_FINALIZE_HOOKS += LUAROCKS_FINALIZE_TARGET +endif -- 2.30.2