From ea095130957130ee340970519d3b183c0b20e6d3 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 28 Jul 2018 11:41:07 +0200 Subject: [PATCH] luci-base: fix luasrcdiet - Stage required libraries as well - Remove not existing make target - Override library search path Fixes: b5d5e5bf1 ("luci-base: update luasrcdiet") Signed-off-by: Jo-Philipp Wich (cherry picked from commit 63fbf5a805085f7ad99aebaaa116e3096fcf792d) --- luci.mk | 2 +- modules/luci-base/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/luci.mk b/luci.mk index 6ece81c3d..f9153819e 100644 --- a/luci.mk +++ b/luci.mk @@ -153,7 +153,7 @@ LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci define SrcDiet $(FIND) $(1) -type f -name '*.lua' | while read src; do \ - if luasrcdiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; \ + if LUA_PATH="$(STAGING_DIR_HOSTPKG)/lib/lua/5.1/?.lua" luasrcdiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; \ then mv "$$$$src.o" "$$$$src"; fi; \ done endef diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index 5c38d99c5..437cdc665 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -37,13 +37,13 @@ endef define Host/Compile $(MAKE) -C src/ clean po2lmo - $(MAKE) -C $(HOST_BUILD_DIR) bin/luasrcdiet endef define Host/Install $(INSTALL_DIR) $(1)/bin $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet + $(CP) $(HOST_BUILD_DIR)/luasrcdiet $(1)/lib/lua/5.1/ endef $(eval $(call HostBuild)) -- 2.25.1