From b4c3854774113527cd06a7b31fe1608978614174 Mon Sep 17 00:00:00 2001 From: remittor Date: Thu, 29 Jan 2026 17:35:02 +0300 Subject: [PATCH] makefile: Replace depend package luajit to luajit2 --- .github/workflows/build.yml | 5 ++++- zapret2/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2bb324..54b31eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -272,6 +272,8 @@ jobs: sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config sed -i 's/CONFIG_LUCI_CSSTIDY=y/CONFIG_LUCI_CSSTIDY=n/g' .config grep -q '^CONFIG_LUCI_CSSTIDY=' .config || echo 'CONFIG_LUCI_CSSTIDY=n' >> .config + sed -i 's/CONFIG_PACKAGE_luajit2=n/CONFIG_PACKAGE_luajit2=y/g' .config + grep -q '^CONFIG_PACKAGE_luajit2=' .config || echo 'CONFIG_PACKAGE_luajit2=y' >> .config echo "status=success" >> $GITHUB_OUTPUT - name: Show config @@ -286,7 +288,8 @@ jobs: env: ARCH_TAG: ${{ matrix.arch }} run: | - PKGLIST="package/zapret-openwrt/zapret2/compile" + PKGLIST="package/feeds/packages/luajit2/compile" + PKGLIST="$PKGLIST package/zapret-openwrt/zapret2/compile" if [ "$ARCH_TAG" = "$LUCI_ARCH" ]; then PKGLIST="$PKGLIST package/zapret-openwrt/luci-app-zapret2/compile" fi diff --git a/zapret2/Makefile b/zapret2/Makefile index abad204..f6636c7 100644 --- a/zapret2/Makefile +++ b/zapret2/Makefile @@ -26,7 +26,7 @@ LUA_JIT?=1 ifeq ($(LUA_JIT),1) LUAJIT_VER?=2.1 LUA_VER?=5.1 - LUA_DEPEND:=luajit + LUA_DEPEND:=luajit2 LUA_INCLUDE:=-I$(STAGING_DIR)/usr/include/luajit-$(LUAJIT_VER) LUA_LIBRARY:=-L$(STAGING_DIR)/usr/lib -lluajit-$(LUA_VER) else