[openwrt/openwrt] apk: disable helptext for host build

LEDE Commits lede-commits at lists.infradead.org
Fri May 17 13:22:46 PDT 2024


aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/b773ca1a966de99a43925bbaa2ac775536a7b112

commit b773ca1a966de99a43925bbaa2ac775536a7b112
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Fri May 17 23:19:52 2024 +0300

    apk: disable helptext for host build
    
    The host build would need Lua to compile which currently adds a race
    condition. Instead of tracking that down just disable helptext for the
    host build.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 package/system/apk/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
index 0f0e043986..7aaf9f4c5e 100644
--- a/package/system/apk/Makefile
+++ b/package/system/apk/Makefile
@@ -17,8 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_INSTALL:=1
 
 HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
-HOST_BUILD_DEPENDS:=lua/host
-PKG_BUILD_DEPENDS:=$(HOST_BUILD_DEPENDS)
+PKG_BUILD_DEPENDS:=lua/host
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -53,7 +52,7 @@ MESON_HOST_VARS+=VERSION=$(PKG_VERSION)
 MESON_VARS+=VERSION=$(PKG_VERSION)
 
 MESON_HOST_ARGS += \
-	-Dlua_version=5.1 \
+	-Dhelp=disabled \
 	-Dcompressed-help=false \
 	-Ddocs=disabled \
 	-Dcrypto_backend=openssl \




More information about the lede-commits mailing list