diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-05 14:29:16 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-06 07:17:25 +0200 |
| commit | 8c704f2cccc3a6e0796f2a0c1d9747d8255971a8 (patch) | |
| tree | d95611a743b5587313d17bfff4e660bd1c2e10a0 /net/nginx/Makefile | |
| parent | 8c37490eff1ea1ea7392b1ff9607f92244ccaaf3 (diff) | |
nginx: fix compilation error for nginx-full
Fix compilation error for stream module not converted to use the PACKAGE
config flag and a missing required dependency for the DAV ext module.
Drop additional config for STREAM module since they are now included and
built by default.
Fixes: 65a676ed56fb ("nginx: introduce support for dynamic modules")
Fixes: #20906
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'net/nginx/Makefile')
| -rw-r--r-- | net/nginx/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/nginx/Makefile b/net/nginx/Makefile index fe8462d69..16767efdd 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx PKG_VERSION:=1.24.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nginx.org/download/ @@ -62,9 +62,6 @@ PKG_CONFIG_DEPENDS := \ CONFIG_NGINX_PCRE \ CONFIG_NGINX_HTTP_REAL_IP \ CONFIG_NGINX_HTTP_SECURE_LINK \ - CONFIG_NGINX_STREAM_CORE_MODULE \ - CONFIG_NGINX_STREAM_SSL_MODULE \ - CONFIG_NGINX_STREAM_SSL_PREREAD_MODULE \ CONFIG_OPENSSL_ENGINE \ CONFIG_OPENSSL_WITH_NPN @@ -257,7 +254,6 @@ else --with-http_dav_module \ --with-http_auth_request_module --with-http_v2_module --with-http_realip_module \ --with-http_secure_link_module --with-http_sub_module \ - --with-stream_ssl_module --with-stream_ssl_preread_module \ config_files += koi-utf koi-win win-utf fastcgi_params uwsgi_params endif @@ -270,7 +266,7 @@ endif ifneq ($(CONFIG_PACKAGE_nginx-mod-dav-ext),) ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module endif -ifneq ($(CONFIG_NGINX_STREAM_CORE_MODULE),) +ifneq ($(CONFIG_PACKAGE_nginx-mod-stream),) ADDITIONAL_MODULES += --with-stream=dynamic --with-stream_ssl_module --with-stream_ssl_preread_module endif ifneq ($(CONFIG_PACKAGE_nginx-mod-ubus),) @@ -382,7 +378,7 @@ endef $(eval $(call module,lua, +luajit,ngx_http_lua, Enable Lua module)) $(eval $(call module,stream, +@NGINX_STREAM_CORE_MODULE,ngx_stream, Add support for NGINX request streaming.)) $(eval $(call module,ubus, +libubus +libjson-c +libblobmsg-json +@NGINX_UBUS,ngx_http_ubus, Enable UBUS api support directly from the server.)) -$(eval $(call module,dav-ext, +@NGINX_DAV,ngx_http_dav_ext, Enable the WebDAV methods PROPFIND OPTIONS LOCK UNLOCK.)) +$(eval $(call module,dav-ext, +@NGINX_DAV +libxml2,ngx_http_dav_ext, Enable the WebDAV methods PROPFIND OPTIONS LOCK UNLOCK.)) $(eval $(call module,headers-more,,ngx_http_headers_more_filter, Set and clear input and output headers...more than "add"!)) $(eval $(call module,rtmp,,ngx_rtmp, Add support for NGINX-based Media Streaming Server module. \ DASH enhanced - https://github.com/ut0mt8/nginx-rtmp-module)) |