[oe-commits] [meta-openembedded] 24/47: nginx: add PACKAGECONFIG[ssl]

git at git.openembedded.org git at git.openembedded.org
Tue Sep 25 16:19:06 UTC 2018


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 4e389f64d7e87efdde26c5164063b7dea6a0d072
Author: Max Kellermann <max.kellermann at gmail.com>
AuthorDate: Tue Sep 18 10:26:02 2018 +0200

    nginx: add PACKAGECONFIG[ssl]
    
    Signed-off-by: Max Kellermann <max.kellermann at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-webserver/recipes-httpd/nginx/nginx.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index f1b50bc..24c2ced 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"
 
 SECTION = "net"
 
-DEPENDS = "libpcre zlib openssl"
+DEPENDS = "libpcre zlib"
 
 SRC_URI = " \
     http://nginx.org/download/nginx-${PV}.tar.gz \
@@ -34,7 +34,10 @@ NGINX_USER   ?= "www"
 EXTRA_OECONF = ""
 DISABLE_STATIC = ""
 
+PACKAGECONFIG ??= "ssl"
+
 PACKAGECONFIG[http2] = "--with-http_v2_module,,"
+PACKAGECONFIG[ssl] = "--with-http_ssl_module,,openssl"
 
 do_configure () {
     if [ "${SITEINFO_BITS}" = "64" ]; then
@@ -72,7 +75,6 @@ do_configure () {
     --pid-path=/run/nginx/nginx.pid \
     --prefix=${prefix} \
     --with-threads \
-    --with-http_ssl_module \
     --with-http_gzip_static_module \
     ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list