diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index edf7d4f..f6b8746 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,8 +93,8 @@ jobs: CFLAGS: ${{ matrix.env.CFLAGS != '' && matrix.env.CFLAGS || null }} LDFLAGS: ${{ matrix.env.LDFLAGS != '' && matrix.env.LDFLAGS || null }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LUA_VER: 5.4 - LUA_RELEASE: 5.4.8 + LUA_VER: 5.5 + LUA_RELEASE: 5.5.0 LUAJIT_VER: 2.1 LUAJIT_RELEASE: 2.1-20250826 LUAJIT_LUAVER: 5.1 diff --git a/nfq2/BSDmakefile b/nfq2/BSDmakefile index 2f8b32c..7da09ab 100644 --- a/nfq2/BSDmakefile +++ b/nfq2/BSDmakefile @@ -15,7 +15,7 @@ LUA_PKG:=luajit .else -LUA_VER ?= 5.4 +LUA_VER ?= 5.5 LUA_VER_UNDOTTED!= echo $(LUA_VER) | sed 's/\.//g' OSNAME!=uname diff --git a/nfq2/Makefile b/nfq2/Makefile index b00f641..4cc2c8c 100644 --- a/nfq2/Makefile +++ b/nfq2/Makefile @@ -72,7 +72,7 @@ ifeq ($(LUA_LIB),) # no success with luajit -LUA_VER?=5.4 +LUA_VER?=5.5 LUA_VER_UNDOTTED:=$(shell echo $(LUA_VER) | sed 's/\.//g') LUA_CFL := @@ -89,7 +89,7 @@ endif ifeq ($(LUA_CFLAGS),) LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKG) 2>/dev/null) ifeq ($(LUA_CFLAGS),) - LUA_CFLAGS := -I/usr/local/include/lua$(LUA_VER) -I/usr/local/include/lua-$(LUA_VER) -I/usr/include/lua$(LUA_VER) -I/usr/include/lua-$(LUA_VER) + LUA_CFLAGS := -I/usr/local/include/lua$(LUA_VER) -I/usr/local/include/lua-$(LUA_VER) -I/usr/include/lua$(LUA_VER) -I/usr/include/lua-$(LUA_VER) -I/usr/local/include/lua -I/usr/local/include endif endif ifeq ($(LUA_LIB),)