From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 14 Sep 2022 12:17:03 +0000 (+0200)
Subject: luci.mk: automatically depend on luci-lua-runtime
X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=b15d768c9a8439dbc66e99f3d5e58d6b0cf8abdf

luci.mk: automatically depend on luci-lua-runtime

Make packages having a non-empty luasrc/ directory automatically depend
on the LuCI Lua runtime package.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/luci.mk b/luci.mk
index fc920f8d3a..f8d6e100bd 100644
--- a/luci.mk
+++ b/luci.mk
@@ -138,6 +138,12 @@ include $(INCLUDE_DIR)/package.mk
 LUCI_SUBMENU_DEFAULT=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app))
 LUCI_SUBMENU=$(if $(LUCI_SUBMENU_FORCED),$(LUCI_SUBMENU_FORCED),$(LUCI_SUBMENU_DEFAULT))
 
+ifneq ($(wildcard ${CURDIR}/luasrc/*),)
+ ifneq ($(filter-out luci-lib-base luci-lua-runtime,$(PKG_NAME)),)
+  LUCI_DEPENDS += +luci-lua-runtime
+ endif
+endif
+
 define Package/$(PKG_NAME)
   SECTION:=$(LUCI_SECTION)
   CATEGORY:=$(LUCI_CATEGORY)
diff --git a/modules/luci-lua-runtime/Makefile b/modules/luci-lua-runtime/Makefile
index 2c6f38f08f..f25e513eb1 100644
--- a/modules/luci-lua-runtime/Makefile
+++ b/modules/luci-lua-runtime/Makefile
@@ -15,6 +15,7 @@ LUCI_TITLE:=LuCI Lua runtime libraries
 LUCI_DEPENDS:= \
 	+luci-base \
 	+lua \
+	+luci-lib-base \
 	+luci-lib-nixio \
 	+luci-lib-ip \
 	+luci-lib-jsonc \