mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/nginx: zone modules need libatomic_ops

Browse Source 
ngx_{http,stream}_upstream_zone_module need libatomic_ops since their
addition in commit 621ec32677 and
cf31347ee8
79a03b3ff6:

src/core/ngx_rwlock.c:125:2: error: #error ngx_atomic_cmp_set() is not defined!
  125 | #error ngx_atomic_cmp_set() is not defined!
      |  ^~~~~

Fixes:
 - http://autobuild.buildroot.org/results/f7f6be00029d430dc575bc5b3e3e2031cea0460c

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit fb3fbb261b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2022-06-05 17:08:07 +02:00
committed by Peter Korsgaard
parent 49def9eac8
commit 0fbf0e5f88
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/nginx/Config.in
View File

@@ -296,6 +296,14 @@ config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE
help help
Enable ngx_http_upstream_random_module Enable ngx_http_upstream_random_module
config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_ZONE_MODULE
bool "ngx_http_upstream_zone_module"
default y
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
select BR2_PACKAGE_LIBATOMIC_OPS
help
Enable ngx_http_upstream_zone_module
endif #BR2_PACKAGE_NGINX_HTTP endif #BR2_PACKAGE_NGINX_HTTP
config BR2_PACKAGE_NGINX_MAIL config BR2_PACKAGE_NGINX_MAIL
@@ -419,6 +427,8 @@ config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE
config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE
bool "ngx_stream_upstream_zone_module" bool "ngx_stream_upstream_zone_module"
default y default y
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
select BR2_PACKAGE_LIBATOMIC_OPS
help help
Enable ngx_stream_upstream_zone_module Enable ngx_stream_upstream_zone_module

3
package/nginx/nginx.mk
View File

@@ -203,7 +203,8 @@ NGINX_CONF_OPTS += \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE),,--without-http_upstream_random_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE),,--without-http_upstream_random_module) \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module) $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module) \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_ZONE_MODULE),,--without-http_upstream_zone_module)
else # !BR2_PACKAGE_NGINX_HTTP else # !BR2_PACKAGE_NGINX_HTTP
NGINX_CONF_OPTS += --without-http NGINX_CONF_OPTS += --without-http