From 8a5f26bd246ade12332bcf43b840039f8cf65b4d Mon Sep 17 00:00:00 2001 From: Oguz Bastemur Date: Thu, 26 Mar 2015 00:06:28 +0100 Subject: [PATCH 1/2] fix install source path for openssl headers Seems node 0.12.x and node 0.10.x / jxcore use the same install script. This must be broken for a very long time. Moving the commit from https://github.com/jxcore/jxcore/commit/fc1023f48d046f5731cb5899581b9353db5c7607 --- tools/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.py b/tools/install.py index 67f72ea027c..c690da94aca 100755 --- a/tools/install.py +++ b/tools/install.py @@ -161,7 +161,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 59ca3cd5f9e657621e18708b11e15518e9a5091a Mon Sep 17 00:00:00 2001 From: Oguz Bastemur Date: Mon, 6 Apr 2015 09:57:39 +0200 Subject: [PATCH 2/2] make sure opensslconf is overwritten --- tools/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.py b/tools/install.py index c690da94aca..7d9024d728c 100755 --- a/tools/install.py +++ b/tools/install.py @@ -160,8 +160,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)