From fb3fbb261b809cf8ce2d9b16984f0dffbc0c1147 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 Jun 2022 17:08:07 +0200 Subject: [PATCH] package/nginx: zone modules need libatomic_ops ngx_{http,stream}_upstream_zone_module need libatomic_ops since their addition in commit 621ec32677082d901806338e6f50f03349dceb76 and https://github.com/nginx/nginx/commit/cf31347ee84fdaa02f768e641d1a2f1352b6a56a https://github.com/nginx/nginx/commit/79a03b3ff6d950e60a06c6d979bd7a909709e82d: 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 Signed-off-by: Peter Korsgaard --- package/nginx/Config.in | 10 ++++++++++ package/nginx/nginx.mk | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 1200b2bf4c..90a0822298 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -296,6 +296,14 @@ config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE help 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 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 bool "ngx_stream_upstream_zone_module" default y + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + select BR2_PACKAGE_LIBATOMIC_OPS help Enable ngx_stream_upstream_zone_module diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 31b6e276b7..cff741ee35 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -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_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_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 NGINX_CONF_OPTS += --without-http