Zos fixes #1451
Zos fixes #1451
Conversation
lib/configure.js
Outdated
| 'node', | ||
| 'out/Release/obj.target/libnode', | ||
| 'out/Debug/obj.target/libnode', | ||
| 'lib/libnode'].map(function(file) { |
There was a problem hiding this comment.
Might be an idea to rewrite the comment just prior to this block as it's no longer AIX specific. We can probably drop the candidate locations from the comment as it's a duplicate of the code. Something like:
// For AIX and z/OS we need to set up the path to the exports file
// which contains the symbols needed for linking.
Also will the exports file ever be include/node/node.x on z/OS? If not, we could slightly speed up by using a different set of candidates per platform.
There was a problem hiding this comment.
Thanks @richardlau
I will rewrite that comment.
Also the exports file on z/OS will never be include/node/node.x
So I will do as you suggested.
NodeJS on z/OS uses shared dll (libnode.so). When linking native addons, node-gyp needs to find the corresponding libnode.x during the link step.
This reverts commit 40edac20c8c9644067636e5722c389954890bccf.
|
new CI after I addressed nits. |
| @@ -233,7 +233,12 @@ def LoadOneBuildFile(build_file_path, data, aux_data, includes, | |||
| # Open the build file for read ('r') with universal-newlines mode ('U') | |||
| # to make sure platform specific newlines ('\r\n' or '\r') are converted to '\n' | |||
| # which otherwise will fail eval() | |||
| build_file_contents = open(build_file_path, 'rU').read() | |||
| if sys.platform == 'zos': | |||
There was a problem hiding this comment.
Did you try to upstream it. Or in other words, will it be a problem for node (if we have non ASCII chars, possibly in config.gypi via node-prefix for example) ?
Or will it be better that node-gyp will generate UTF-8-BOM files, and skip patching GYP?
There was a problem hiding this comment.
@refack I tried looking for what node-prefix does. but couldn't find anything. Can you point me to some documentation about it?
Node.js on z/OS uses shared dll (libnode.so). When linking native addons, node-gyp needs to find the corresponding libnode.x during the link step. PR-URL: #1451 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Refael Ackermann <refack@gmail.com>
PR-URL: #1451 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Refael Ackermann <refack@gmail.com>
|
Cheers, landed in 293092c...eaedc12. |
Checklist
npm install && npm testpassesDescription of change
On z/OS, we fixed up node-gyp that comes packaged with node 6.x.
This PR transports those fixes here so that node-gyp works as a standalone.