aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Martin Bark <martin@barkynet.com>2016-05-03 10:36:56 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-05-05 22:30:06 +0200
commit2748bc6b6544347c75837205c8537d2321d4393f (patch)
tree634d30be392bf945e8afae880fbd9c0588b36d4e
parent621ec32677082d901806338e6f50f03349dceb76 (diff)
downloadbuildroot-2748bc6b6544347c75837205c8537d2321d4393f.tar.gz
buildroot-2748bc6b6544347c75837205c8537d2321d4393f.tar.bz2
package/nginx: add thread pool support
Signed-off-by: Martin Bark <martin@barkynet.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/nginx/Config.in7
-rw-r--r--package/nginx/nginx.mk3
2 files changed, 9 insertions, 1 deletions
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index f925cc75bc..ca3e3eb4b0 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -18,6 +18,13 @@ config BR2_PACKAGE_NGINX_FILE_AIO
depends on !BR2_aarch64
depends on !BR2_arc
+config BR2_PACKAGE_NGINX_THREADS
+ bool "thread pool support"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+
+comment "thread pool support needs a toolchain w/ threads"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
+
config BR2_PACKAGE_NGINX_HTTP
bool "http server"
default y
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 7f3b075a73..91772b351b 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -64,7 +64,8 @@ NGINX_CONF_OPTS += \
--http-uwsgi-temp-path=/var/tmp/nginx/uwsgi
NGINX_CONF_OPTS += \
- $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio)
+ $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \
+ $(if $(BR2_PACKAGE_NGINX_THREADS),--with-threads)
ifeq ($(BR2_PACKAGE_PCRE),y)
NGINX_DEPENDENCIES += pcre