From 1cb10ee6753fb4a12fe9a21fff0035bc2188eefa Mon Sep 17 00:00:00 2001 From: Oguz Bastemur Date: Mon, 6 Apr 2015 09:14:27 +0200 Subject: [PATCH 1/2] fix install source path for openssl headers This part is broken for a very long time. We noticed the problem while using jxcore native interface with embedded openssl. I've also sent a pull request to node.js repo. The problem may affect a native addon using builtin openssl. --- tools/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.py b/tools/install.py index 5cf78b52814683..094cadb5ba76e3 100755 --- a/tools/install.py +++ b/tools/install.py @@ -174,7 +174,7 @@ def files(action): if 'false' == variables.get('node_shared_openssl'): action(['deps/openssl/config/opensslconf.h'], 'include/node/openssl/') - subdir_files('deps/openssl/include/openssl', 'include/node/openssl/', action) + subdir_files('deps/openssl/openssl/include/openssl', 'include/node/openssl/', action) if 'false' == variables.get('node_shared_v8'): subdir_files('deps/v8/include', 'include/node/', action) From 80ad4f4a616ac541323eb51c444cd8cba9aa10ec Mon Sep 17 00:00:00 2001 From: Oguz Bastemur Date: Mon, 6 Apr 2015 09:51:48 +0200 Subject: [PATCH 2/2] overwrite opensslconf --- tools/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.py b/tools/install.py index 094cadb5ba76e3..2d00cf06d7398c 100755 --- a/tools/install.py +++ b/tools/install.py @@ -173,8 +173,8 @@ def files(action): subdir_files('deps/uv/include', 'include/node/', action) if 'false' == variables.get('node_shared_openssl'): - action(['deps/openssl/config/opensslconf.h'], 'include/node/openssl/') subdir_files('deps/openssl/openssl/include/openssl', 'include/node/openssl/', action) + action(['deps/openssl/config/opensslconf.h'], 'include/node/openssl/') if 'false' == variables.get('node_shared_v8'): subdir_files('deps/v8/include', 'include/node/', action)