From 11d9b332de786fbf6a5db59ebcc2b11683b6ec91 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Fri, 26 Jun 2015 22:19:30 +1000 Subject: [PATCH] node-gyp: download header tarball for compile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Temporary fix only, node-gyp needs to be aware of whether it can even download this file for the current runtime so that information needs to come from the process itself. Floating patch on npm. PR-URL: https://github.com/nodejs/io.js/pull/2066 Reviewed-By: Johan Bergström Reviewed-By: Ryan Graham --- deps/npm/node_modules/node-gyp/addon.gypi | 1 + deps/npm/node_modules/node-gyp/lib/configure.js | 6 +++++- deps/npm/node_modules/node-gyp/lib/install.js | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deps/npm/node_modules/node-gyp/addon.gypi b/deps/npm/node_modules/node-gyp/addon.gypi index 09ee70d9c22a64..1872c48c7fa279 100644 --- a/deps/npm/node_modules/node-gyp/addon.gypi +++ b/deps/npm/node_modules/node-gyp/addon.gypi @@ -5,6 +5,7 @@ 'product_prefix': '', 'include_dirs': [ + '<(node_root_dir)/include/node', '<(node_root_dir)/src', '<(node_root_dir)/deps/uv/include', '<(node_root_dir)/deps/v8/include' diff --git a/deps/npm/node_modules/node-gyp/lib/configure.js b/deps/npm/node_modules/node-gyp/lib/configure.js index 0a33e70088f325..337bce51d1658f 100644 --- a/deps/npm/node_modules/node-gyp/lib/configure.js +++ b/deps/npm/node_modules/node-gyp/lib/configure.js @@ -310,7 +310,11 @@ function configure (gyp, argv, callback) { // this logic ported from the old `gyp_addon` python file var gyp_script = path.resolve(__dirname, '..', 'gyp', 'gyp_main.py') var addon_gypi = path.resolve(__dirname, '..', 'addon.gypi') - var common_gypi = path.resolve(nodeDir, 'common.gypi') + var common_gypi = path.resolve(nodeDir, 'include/node/common.gypi') + //TODO: ideally async + if (!fs.existsSync(common_gypi)) + common_gypi = path.resolve(nodeDir, 'common.gypi') + var output_dir = 'build' if (win) { // Windows expects an absolute path diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js index d828d529ac157d..cecd7fd4af4e54 100644 --- a/deps/npm/node_modules/node-gyp/lib/install.js +++ b/deps/npm/node_modules/node-gyp/lib/install.js @@ -185,7 +185,7 @@ function install (gyp, argv, callback) { // now download the node tarball var tarPath = gyp.opts['tarball'] - var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/iojs-v' + version + '.tar.gz' + var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/iojs-v' + version + '-headers.tar.gz' , badDownload = false , extractCount = 0 , gunzip = zlib.createGunzip()