openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 23:34:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

nginx: drop extra dependency <2 for nginx-util

Browse Source 
Drop extra dependency <2 for nginx-util. The reason is not clear and
cause problems with APK package creation.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2024-10-23 18:42:47 +02:00
parent ad14af942c
commit 9c563d536c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/nginx/Makefile
View File

@@ -117,7 +117,7 @@ define Package/nginx-ssl
DEPENDS+= +NGINX_PCRE:libpcre2 \ DEPENDS+= +NGINX_PCRE:libpcre2 \
+NGINX_PCRE:nginx-ssl-util +!NGINX_PCRE:nginx-ssl-util-nopcre \ +NGINX_PCRE:nginx-ssl-util +!NGINX_PCRE:nginx-ssl-util-nopcre \
+NGINX_HTTP_GZIP:zlib +NGINX_DAV:libxml2 +NGINX_HTTP_GZIP:zlib +NGINX_DAV:libxml2
EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-1) (<2) EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-1)
CONFLICTS:=nginx-full CONFLICTS:=nginx-full
endef endef
@@ -165,7 +165,7 @@ define Package/nginx-full
$(Package/nginx/default) $(Package/nginx/default)
TITLE += with ALL config selected TITLE += with ALL config selected
DEPENDS+=+libpcre2 +nginx-ssl-util +zlib +libxml2 DEPENDS+=+libpcre2 +nginx-ssl-util +zlib +libxml2
EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-1) (<2) EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-1)
VARIANT:=full VARIANT:=full
PROVIDES += nginx-ssl PROVIDES += nginx-ssl
endef endef