Permalink
Browse files

build: support shared zlib

  • Loading branch information...
1 parent 3c68c85 commit d03b8487c608cb030055a6ccff34ae59a230356a @tchollingsworth tchollingsworth committed with bnoordhuis Feb 26, 2012
Showing with 36 additions and 2 deletions.
  1. +31 −1 configure
  2. +5 −1 node.gyp
View
@@ -98,6 +98,26 @@ parser.add_option("--shared-cares-libpath",
dest="shared_cares_libpath",
help="A directory to search for the shared C-Ares DLL")
+parser.add_option("--shared-zlib",
+ action="store_true",
+ dest="shared_zlib",
+ help="Link to a shared zlib DLL instead of static linking")
+
+parser.add_option("--shared-zlib-includes",
+ action="store",
+ dest="shared_zlib_includes",
+ help="Directory containing zlib header files")
+
+parser.add_option("--shared-zlib-libpath",
+ action="store",
+ dest="shared_zlib_libpath",
+ help="A directory to search for the shared zlib DLL")
+
+parser.add_option("--shared-zlib-libname",
+ action="store",
+ dest="shared_zlib_libname",
+ help="Alternative lib name to link to (default: 'z')")
+
parser.add_option("--with-dtrace",
action="store_true",
dest="with_dtrace",
@@ -197,7 +217,17 @@ def configure_node(o):
def configure_libz(o):
- o['libraries'] += ['-lz']
+ o['variables']['node_shared_zlib'] = b(options.shared_zlib)
+
+ # assume shared_zlib if one of these is set?
+ if options.shared_zlib_libpath:
+ o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
+ if options.shared_zlib_libname:
+ o['libraries'] += ['-l%s' % options.shared_zlib_libname]
+ elif options.shared_zlib:
+ o['libraries'] += ['-lz']
+ if options.shared_zlib_includes:
+ o['include_dirs'] += [options.shared_zlib_includes]
def configure_v8(o):
View
@@ -6,6 +6,7 @@
'werror': '',
'node_use_dtrace': 'false',
'node_shared_v8%': 'false',
+ 'node_shared_zlib%': 'false',
'node_use_openssl%': 'true',
'node_use_system_openssl%': 'false',
'library_files': [
@@ -56,7 +57,6 @@
'dependencies': [
'deps/http_parser/http_parser.gyp:http_parser',
'deps/uv/uv.gyp:uv',
- 'deps/zlib/zlib.gyp:zlib',
'node_js2c#host',
],
@@ -158,6 +158,10 @@
'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
}],
+ [ 'node_shared_zlib=="false"', {
+ 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
+ }],
+
[ 'OS=="win"', {
'sources': [
'tools/msvs/res/node.rc',

0 comments on commit d03b848

Please sign in to comment.