From 5de9bc64ad67ab3c0da84163afd77c23f131287d Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 9 Mar 2017 10:31:54 +0100 Subject: [PATCH 1/2] build: add node_use_openssl check to install.py When configuring --without-ssl and then running make install openssl headers will be copied from deps/openssl to the target installation directory. This commit adds a check for is node_use_openssl is set in which case the headers are not copied. --- configure | 1 - tools/install.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 31d682575e7a0d..527fb76da369f2 100755 --- a/configure +++ b/configure @@ -975,7 +975,6 @@ def configure_openssl(o): else: o['variables']['openssl_fips'] = '' - if options.without_ssl: return configure_library('openssl', o) diff --git a/tools/install.py b/tools/install.py index 4f155376eaf534..d1100352c6a413 100755 --- a/tools/install.py +++ b/tools/install.py @@ -165,7 +165,8 @@ def headers(action): if 'false' == variables.get('node_shared_libuv'): subdir_files('deps/uv/include', 'include/node/', action) - if 'false' == variables.get('node_shared_openssl'): + if 'true' == variables.get('node_use_openssl') and \ + 'false' == variables.get('node_shared_openssl'): subdir_files('deps/openssl/openssl/include/openssl', 'include/node/openssl/', action) subdir_files('deps/openssl/config/archs', 'include/node/openssl/archs', action) action(['deps/openssl/config/opensslconf.h'], 'include/node/openssl/') From 8528244b70347fdaa90f100b1a28eeeb4b713f2e Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 10 Mar 2017 20:07:55 +0100 Subject: [PATCH 2/2] remove white space change --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 527fb76da369f2..31d682575e7a0d 100755 --- a/configure +++ b/configure @@ -975,6 +975,7 @@ def configure_openssl(o): else: o['variables']['openssl_fips'] = '' + if options.without_ssl: return configure_library('openssl', o)