diff --git a/docs/compile/build_howto_unix.txt b/docs/compile/build_howto_unix.txt index dcee076..b2e7fec 100644 --- a/docs/compile/build_howto_unix.txt +++ b/docs/compile/build_howto_unix.txt @@ -5,6 +5,7 @@ make -C /opt/zapret2 systemd FreeBSD : +pkg install pkgconf pkg search luajit-2 # see what's the version available pkg install luajit-2.1.0.20250728 diff --git a/nfq2/BSDmakefile b/nfq2/BSDmakefile index e29df74..2f8b32c 100644 --- a/nfq2/BSDmakefile +++ b/nfq2/BSDmakefile @@ -1,4 +1,5 @@ CC ?= cc +PKG_CONFIG ?= pkg-config OPTIMIZE ?= -Os CFLAGS += -std=gnu99 -s $(OPTIMIZE) -flto=auto -Wno-address-of-packed-member LIBS = -lz -lm @@ -26,8 +27,8 @@ OSNAME!=uname .endif -LUA_LIB!= pkg-config --libs $(LUA_PKG) -LUA_CFLAGS!= pkg-config --cflags $(LUA_PKG) +LUA_LIB!= $(PKG_CONFIG) --libs $(LUA_PKG) +LUA_CFLAGS!= $(PKG_CONFIG) --cflags $(LUA_PKG) .if "${LUA_JIT}" == "1" LUA_CFLAGS+=-DLUAJIT diff --git a/nfq2/Makefile b/nfq2/Makefile index 2f90320..b00f641 100644 --- a/nfq2/Makefile +++ b/nfq2/Makefile @@ -1,4 +1,5 @@ CC ?= cc +PKG_CONFIG ?= pkg-config OPTIMIZE ?= -Os CFLAGS += -std=gnu99 $(OPTIMIZE) -flto=auto CFLAGS_SYSTEMD = -DUSE_SYSTEMD @@ -16,7 +17,6 @@ RES_CYGWIN32 = windows/res/32/winmanifest.o windows/res/32/winicon.o RES_CYGWIN64 = windows/res/64/winmanifest.o windows/res/64/winicon.o SRC_FILES = *.c crypto/*.c - LUA_JIT?=1 ifeq ($(LUA_JIT),1) @@ -29,13 +29,13 @@ $(info trying luajit $(LUAJIT_VER) lua $(LUAJIT_LUA_VER)) LUA_LIB_NAME= ifeq ($(LUA_CFLAGS),) - LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKG) 2>/dev/null) + LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKG) 2>/dev/null) ifeq ($(LUA_CFLAGS),) LUA_CFLAGS := -I/usr/local/include/luajit-$(LUAJIT_VER) -I/usr/include/luajit-$(LUAJIT_VER) endif endif ifeq ($(LUA_LIB),) - LUA_LIB := $(shell pkg-config --libs $(LUA_PKG) 2>/dev/null) + LUA_LIB := $(shell $(PKG_CONFIG) --libs $(LUA_PKG) 2>/dev/null) LUA_LIB_DIR := ifeq ($(LUA_LIB),) @@ -87,13 +87,13 @@ else endif ifeq ($(LUA_CFLAGS),) - LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKG) 2>/dev/null) + 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) endif endif ifeq ($(LUA_LIB),) - LUA_LIB := $(shell pkg-config --libs $(LUA_PKG) 2>/dev/null) + LUA_LIB := $(shell $(PKG_CONFIG) --libs $(LUA_PKG) 2>/dev/null) LUA_LIB_DIR := ifeq ($(LUA_LIB),) ifneq ($(wildcard /usr/local/lib/liblua-$(LUA_VER).*),)