From a850cdce5373408890a2b35de31db04963870143 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 12 Apr 2020 14:00:43 +0200 Subject: [PATCH] package/pkg-luarocks.mk: use custom luarocks config file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In preparation for the addition of the support for host-luarocks packages, this commit changes the luarocks logic to use a custom configuration file in $(HOST_DIR)/etc/luarocks/config.lua instead of the default $(HOST_DIR)/etc/luarocks/config-$(LUAINTERPRETER_ABIVER).lua. Signed-off-by: Francois Perrad [Thomas: extracted from a larger patch from François] Signed-off-by: Thomas Petazzoni --- package/luarocks/luarocks.mk | 9 ++++++--- package/pkg-luarocks.mk | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 17360048cd..cf111e4c91 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -12,7 +12,8 @@ LUAROCKS_LICENSE_FILES = COPYING HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc -LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua +LUAROCKS_CONFIG_FILE_DEFAULT = $(LUAROCKS_CONFIG_DIR)/luarocks/config-$(LUAINTERPRETER_ABIVER).lua +LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config.lua define LUAROCKS_ADDON_EXTRACT mkdir $(@D)/src/luarocks/cmd/external @@ -30,9 +31,11 @@ define HOST_LUAROCKS_CONFIGURE_CMDS endef define HOST_LUAROCKS_INSTALL_CMDS - rm -f $(LUAROCKS_CONFIG_FILE) + rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT) $(MAKE1) -C $(@D) install - cat $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua >> $(LUAROCKS_CONFIG_FILE) + cat $(LUAROCKS_CONFIG_FILE_DEFAULT) $(HOST_LUAROCKS_PKGDIR)/luarocks-br-config.lua \ + > $(LUAROCKS_CONFIG_FILE)a + rm -f $(LUAROCKS_CONFIG_FILE_DEFAULT) endef $(eval $(host-generic-package)) diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk index 23906f4a86..a50a4fcf5a 100644 --- a/package/pkg-luarocks.mk +++ b/package/pkg-luarocks.mk @@ -70,6 +70,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$($(2)_SRCDIR) && \ + LUAROCKS_CONFIG=$$(LUAROCKS_CONFIG_FILE) \ $$(LUAROCKS_RUN_CMD) make --keep --deps-mode none \ --tree "$$(TARGET_DIR)/usr" \ LUA_INCDIR="$$(STAGING_DIR)/usr/include" \ -- 2.30.2