From 5c1bcb61336b2b32788568d3dafa221b586dd430 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sat, 23 Sep 2023 19:02:07 +0200 Subject: [PATCH] treewide: add HAS_LUAJIT_ARCH dependency to luajit user Add HAS_LUAJIT_ARCH dependency to any user of luajit to fix circular dependency limitation. Signed-off-by: Christian Marangi --- net/dnsdist/Makefile | 2 +- net/knot-resolver/Makefile | 2 +- net/nginx/Makefile | 2 +- net/snort/Makefile | 2 +- net/snort3/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile index a9bb2e2bb9..50b0cfacb5 100644 --- a/net/dnsdist/Makefile +++ b/net/dnsdist/Makefile @@ -35,7 +35,7 @@ define Package/dnsdist/Default +libatomic \ +libcap \ +libstdcpp \ - +luajit + @HAS_LUAJIT_ARCH +luajit URL:=https://dnsdist.org/ VARIANT:=$(1) PROVIDES:=dnsdist diff --git a/net/knot-resolver/Makefile b/net/knot-resolver/Makefile index 8732ff7f33..735e1f7d26 100644 --- a/net/knot-resolver/Makefile +++ b/net/knot-resolver/Makefile @@ -34,7 +34,7 @@ define Package/knot-resolver +knot-libs \ +knot-libzscanner \ +libuv \ - +luajit \ + @HAS_LUAJIT_ARCH +luajit \ +luasec \ +luasocket \ +libstdcpp \ diff --git a/net/nginx/Makefile b/net/nginx/Makefile index a2ce0a0fea..66a0c8713d 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -210,7 +210,7 @@ endef define Package/nginx-mod-lua-resty-lrucache $(call Package/nginx/default) - DEPENDS:=+luajit2 + DEPENDS:=@HAS_LUAJIT_ARCH +luajit2 TITLE:=Nginx Lua OpenResty lrucache module endef diff --git a/net/snort/Makefile b/net/snort/Makefile index f5e246df49..6afffec5c8 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -31,7 +31,7 @@ define Package/snort SUBMENU:=Firewall SECTION:=net CATEGORY:=Network - DEPENDS:=+libdaq +libdnet +libnghttp2 +libopenssl +libpcap +libpcre +libpthread +libtirpc +libuuid +zlib +luajit +SNORT_LZMA:liblzma + DEPENDS:=+libdaq +libdnet +libnghttp2 +libopenssl +libpcap +libpcre +libpthread +libtirpc +libuuid +zlib @HAS_LUAJIT_ARCH +luajit +SNORT_LZMA:liblzma TITLE:=Lightweight Network Intrusion Detection System URL:=http://www.snort.org/ CONFLICTS:=snort3 diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 691d08be81..ea4f115fff 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -25,7 +25,7 @@ define Package/snort3 SUBMENU:=Firewall SECTION:=net CATEGORY:=Network - DEPENDS:=+libstdcpp +libdaq3 +libdnet +libopenssl +libpcap +libpcre +libpthread +libuuid +zlib +libhwloc +libtirpc +luajit +libatomic + DEPENDS:=+libstdcpp +libdaq3 +libdnet +libopenssl +libpcap +libpcre +libpthread +libuuid +zlib +libhwloc +libtirpc @HAS_LUAJIT_ARCH +luajit +libatomic TITLE:=Lightweight Network Intrusion Detection System URL:=http://www.snort.org/ MENU:=1 -- 2.30.2