gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 20:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

nginx: adjust with glibc and libcrypt-compat

Browse Source 
glibc 2.39 has removed libcrypt completely.
solution: link against libxcrypt built with glibc compatibility.

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
This commit is contained in:
Konstantin Demin
2025-07-06 09:01:50 +03:00
committed by Josef Schlehofer
parent cc4d6911e2
commit 2af886742c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/nginx/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx PKG_NAME:=nginx
PKG_VERSION:=1.26.3 PKG_VERSION:=1.26.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/ PKG_SOURCE_URL:=https://nginx.org/download/
@@ -114,7 +114,7 @@ define Package/nginx-ssl
$(Package/nginx/default) $(Package/nginx/default)
TITLE += with SSL support TITLE += with SSL support
VARIANT:=ssl VARIANT:=ssl
DEPENDS+= +NGINX_PCRE:libpcre2 \ DEPENDS+= +USE_GLIBC:libcrypt-compat +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-r1) EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-r1)
@@ -164,7 +164,7 @@ endef
define Package/nginx-full 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+= +USE_GLIBC:libcrypt-compat +libpcre2 +nginx-ssl-util +zlib +libxml2
EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-r1) EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-r1)
VARIANT:=full VARIANT:=full
PROVIDES += nginx-ssl PROVIDES += nginx-ssl