diff options
| author | Rod Vagg <rod@vagg.org> | 2015-06-26 15:19:30 +0300 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-06-30 09:37:35 +0300 |
| commit | 8f6f4280c676db0e5ee114cdc1a27cd3290ab335 (patch) | |
| tree | 663253901e9e356a6aee8e32ce796e8017c27579 | |
| parent | bda3a2dd9d5a4dc3718835b00403b6d1a3d4a7bb (diff) | |
node-gyp: download header tarball for compile
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 <bugs@bergstroem.nu>
Reviewed-By: Ryan Graham <ryan@strongloop.com>
| -rw-r--r-- | deps/npm/node_modules/node-gyp/addon.gypi | 1 | ||||
| -rw-r--r-- | deps/npm/node_modules/node-gyp/lib/configure.js | 6 | ||||
| -rw-r--r-- | 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 09ee70d9c22..1872c48c7fa 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 0a33e70088f..337bce51d16 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 d828d529ac1..cecd7fd4af4 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() |