Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: fix luasrcdiet

Browse source 
- 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 <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-07-28 11:41:07 +02:00
parent aae187dedf
commit 63fbf5a805
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
luci.mk
View file

@ -153,7 +153,7 @@ LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
define SrcDiet define SrcDiet
$(FIND) $(1) -type f -name '*.lua' | while read src; do \ $(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; \ then mv "$$$$src.o" "$$$$src"; fi; \
done done
endef endef

2
modules/luci-base/Makefile
View file

@ -37,13 +37,13 @@ endef
define Host/Compile define Host/Compile
$(MAKE) -C src/ clean po2lmo $(MAKE) -C src/ clean po2lmo
$(MAKE) -C $(HOST_BUILD_DIR) bin/luasrcdiet
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/bin
$(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet
$(CP) $(HOST_BUILD_DIR)/luasrcdiet $(1)/lib/lua/5.1/
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))