nodejs
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: export zlib symbols on Windows 

Base the generated openssl.def on existing zlib.def. We cannot specify
more than one DEF file per executable so we need to merge the two DEF
files to expose both OpenSSL and Zlib functionality to addons.

If OpenSSL is not used, link against zlib.def itself.

PR-URL: https://github.com/nodejs/node/pull/7983
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Alex Hultman 2016-08-05 04:36:40 +02:00 committed by Anna Henningsen
parent 8f90dcc1b8
commit 359352c9e9
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
node.gyp
View File

@ -370,9 +370,14 @@
'-Wl,--no-whole-archive',
],
}],
# openssl.def is based on zlib.def, zlib symbols
# are always exported.
['use_openssl_def==1', {
'sources': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
}],
['OS=="win" and use_openssl_def==0', {
'sources': ['deps/zlib/win32/zlib.def'],
}],
],
}],
],
@ -568,6 +573,8 @@
'-X^DSO',
'-X^_',
'-X^private_',
# Base generated DEF on zlib.def
'-Bdeps/zlib/win32/zlib.def'
],
},
'conditions': [

9
tools/mkssldef.py
View File

@ -7,6 +7,7 @@ import sys
categories = []
defines = []
excludes = []
bases = []
if __name__ == '__main__':
out = sys.stdout
@ -18,6 +19,7 @@ if __name__ == '__main__':
elif option.startswith('-C'): categories += option[2:].split(',')
elif option.startswith('-D'): defines += option[2:].split(',')
elif option.startswith('-X'): excludes += option[2:].split(',')
elif option.startswith('-B'): bases += option[2:].split(',')
excludes = map(re.compile, excludes)
exported = []
@ -40,5 +42,12 @@ if __name__ == '__main__':
if not satisfy(meta[3], categories): continue
exported.append(name)
for filename in bases:
for line in open(filename).readlines():
line = line.strip()
if line == 'EXPORTS': continue
if line[0] == ';': continue
exported.append(line)
print('EXPORTS', file=out)
for name in sorted(exported): print(' ', name, file=out)