diff options
author | Max Kellermann <max.kellermann@gmail.com> | 2018-09-18 10:26:02 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-24 11:49:45 -0700 |
commit | 4e389f64d7e87efdde26c5164063b7dea6a0d072 (patch) | |
tree | 25409af53557526bbbc9b98448c1e0811aec41e5 /meta-webserver/recipes-httpd | |
parent | a2bce54990cc882c17b8f02c77b442f923068d2e (diff) | |
download | meta-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/recipes-httpd')
-rw-r--r-- | meta-webserver/recipes-httpd/nginx/nginx.inc | 6 |
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 | ||
10 | SECTION = "net" | 10 | SECTION = "net" |
11 | 11 | ||
12 | DEPENDS = "libpcre zlib openssl" | 12 | DEPENDS = "libpcre zlib" |
13 | 13 | ||
14 | SRC_URI = " \ | 14 | SRC_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" | |||
34 | EXTRA_OECONF = "" | 34 | EXTRA_OECONF = "" |
35 | DISABLE_STATIC = "" | 35 | DISABLE_STATIC = "" |
36 | 36 | ||
37 | PACKAGECONFIG ??= "ssl" | ||
38 | |||
37 | PACKAGECONFIG[http2] = "--with-http_v2_module,," | 39 | PACKAGECONFIG[http2] = "--with-http_v2_module,," |
40 | PACKAGECONFIG[ssl] = "--with-http_ssl_module,,openssl" | ||
38 | 41 | ||
39 | do_configure () { | 42 | do_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 | } |