diff options
author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-03-07 22:31:05 +0900 |
---|---|---|
committer | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-04-10 06:45:45 +0900 |
commit | 08af7dba2aa7ea49858d0f05c68fd21cdadf4c15 (patch) | |
tree | 0532d2d842912ca468287b2e22c1293020208bab /node.gyp | |
parent | 7812ec735ba50493c417a4860aa491fcee67d149 (diff) | |
download | android-node-v8-08af7dba2aa7ea49858d0f05c68fd21cdadf4c15.tar.gz android-node-v8-08af7dba2aa7ea49858d0f05c68fd21cdadf4c15.tar.bz2 android-node-v8-08af7dba2aa7ea49858d0f05c68fd21cdadf4c15.zip |
build: add OpenSSL-1.1.0 support
- For Windows, nasm is new build requirements and openssl_no_asm is
set to 1 with warning if it is not installed.
- For use of openssl assemble codes, either gas_version >= 2.23,
xcode_version >= 5.0 ,llvm_version >= 3.3 or nasm_version >= 2.10 is
needed. Otherwise, openssl_no_asm is set to 1 with warning.
- FIPS is not supported in OpenSSL-1.1.0 so that it leads an error
when openssl_fips options is enabled in configure.
Fixes: https://github.com/nodejs/node/issues/4270
PR-URL: https://github.com/nodejs/node/pull/19794
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'node.gyp')
-rw-r--r-- | node.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -609,8 +609,8 @@ { 'action_name': 'mkssldef', 'inputs': [ - 'deps/openssl/openssl/util/libeay.num', - 'deps/openssl/openssl/util/ssleay.num', + 'deps/openssl/openssl/util/libcrypto.num', + 'deps/openssl/openssl/util/libssl.num', ], 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'], 'action': [ |