summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorMax Kellermann <max.kellermann@gmail.com>2018-09-18 10:26:02 +0200
committerKhem Raj <raj.khem@gmail.com>2018-09-24 11:49:45 -0700
commit4e389f64d7e87efdde26c5164063b7dea6a0d072 (patch)
tree25409af53557526bbbc9b98448c1e0811aec41e5 /meta-webserver
parenta2bce54990cc882c17b8f02c77b442f923068d2e (diff)
downloadmeta-openembedded-4e389f64d7e87efdde26c5164063b7dea6a0d072.tar.gz
nginx: add PACKAGECONFIG[ssl]
Signed-off-by: Max Kellermann <max.kellermann@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index f1b50bcde..24c2cedf5 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -9,7 +9,7 @@ LICENSE = "BSD-2-Clause"
9 9
10SECTION = "net" 10SECTION = "net"
11 11
12DEPENDS = "libpcre zlib openssl" 12DEPENDS = "libpcre zlib"
13 13
14SRC_URI = " \ 14SRC_URI = " \
15 http://nginx.org/download/nginx-${PV}.tar.gz \ 15 http://nginx.org/download/nginx-${PV}.tar.gz \
@@ -34,7 +34,10 @@ NGINX_USER ?= "www"
34EXTRA_OECONF = "" 34EXTRA_OECONF = ""
35DISABLE_STATIC = "" 35DISABLE_STATIC = ""
36 36
37PACKAGECONFIG ??= "ssl"
38
37PACKAGECONFIG[http2] = "--with-http_v2_module,," 39PACKAGECONFIG[http2] = "--with-http_v2_module,,"
40PACKAGECONFIG[ssl] = "--with-http_ssl_module,,openssl"
38 41
39do_configure () { 42do_configure () {
40 if [ "${SITEINFO_BITS}" = "64" ]; then 43 if [ "${SITEINFO_BITS}" = "64" ]; then
@@ -72,7 +75,6 @@ do_configure () {
72 --pid-path=/run/nginx/nginx.pid \ 75 --pid-path=/run/nginx/nginx.pid \
73 --prefix=${prefix} \ 76 --prefix=${prefix} \
74 --with-threads \ 77 --with-threads \
75 --with-http_ssl_module \
76 --with-http_gzip_static_module \ 78 --with-http_gzip_static_module \
77 ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} 79 ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
78} 80}