1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix openssl link error on windows

Browse Source 
This commit attempts to fix an issue when building on windows using the
following command line options:
.\vcbuild.bat dll debug x64 vc2015

This will result in the following options passed to configure:
configure --debug --shared --dest-cpu=x64 --tag=

This commit excludes the dependency to openssl if node is configured
with --shared.

Also, FP_API to the categories to export in mkssldef when generating
the module definition (openssl.def) allowing the build to compile and
link successfully.

Fixes: https://github.com/nodejs/node/issues/12952
PR-URL: https://github.com/nodejs/node/pull/13078
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
This commit is contained in:
Daniel Bevenius 2017-05-16 19:56:59 +02:00
parent 920278bd37
commit 1cde375763
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node.gyp
View File

@ -277,7 +277,7 @@
# Categories to export. # Categories to export.
'-CAES,BF,BIO,DES,DH,DSA,EC,ECDH,ECDSA,ENGINE,EVP,HMAC,MD4,MD5,' '-CAES,BF,BIO,DES,DH,DSA,EC,ECDH,ECDSA,ENGINE,EVP,HMAC,MD4,MD5,'
'NEXTPROTONEG,PSK,RC2,RC4,RSA,SHA,SHA0,SHA1,SHA256,SHA512,SOCK,' 'NEXTPROTONEG,PSK,RC2,RC4,RSA,SHA,SHA0,SHA1,SHA256,SHA512,SOCK,'
'STDIO,TLSEXT', 'STDIO,TLSEXT,FP_API',
# Defines. # Defines.
'-DWIN32', '-DWIN32',
# Symbols to filter from the export list. # Symbols to filter from the export list.
@ -671,7 +671,7 @@
'deps/zlib/zlib.gyp:zlib', 'deps/zlib/zlib.gyp:zlib',
] ]
}], }],
[ 'node_shared_openssl=="false"', { [ 'node_shared_openssl=="false" and node_shared=="false"', {
'dependencies': [ 'dependencies': [
'deps/openssl/openssl.gyp:openssl' 'deps/openssl/openssl.gyp:openssl'
] ]