GeezerVison is showing github.com — src: fix dynamically linked zlib version · nodejs/node@f90fc83
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: node.gypi +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
141 | 141 | } ], |
142 | 142 | [ 'node_shared_zlib=="false"', { |
143 | 143 | 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ], |
| 144 | + 'defines': [ 'NODE_BUNDLED_ZLIB' ], |
144 | 145 | 'conditions': [ |
145 | 146 | [ 'force_load=="true"', { |
146 | 147 | 'xcode_settings': { |
|
Collapse file
Copy file name to clipboardExpand all lines: src/node_metadata.cc +9Lines changed: 9 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
15 | 15 | #include "uv.h" |
16 | 16 | #include "uvwasi.h" |
17 | 17 | #include "v8.h" |
| 18 | + |
| 19 | +#ifdef NODE_BUNDLED_ZLIB |
18 | 20 | #include "zlib_version.h" |
| 21 | +#else |
| 22 | +#include <zlib.h> |
| 23 | +#endif // NODE_BUNDLED_ZLIB |
19 | 24 |
|
20 | 25 | #if HAVE_OPENSSL |
21 | 26 | #include <openssl/opensslv.h> |
@@ -79,7 +84,11 @@ Metadata::Versions::Versions() { |
79 | 84 | node = NODE_VERSION_STRING; |
80 | 85 | v8 = v8::V8::GetVersion(); |
81 | 86 | uv = uv_version_string(); |
| 87 | +#ifdef NODE_BUNDLED_ZLIB |
82 | 88 | zlib = ZLIB_VERSION; |
| 89 | +#else |
| 90 | + zlib = zlibVersion(); |
| 91 | +#endif // NODE_BUNDLED_ZLIB |
83 | 92 | ares = ARES_VERSION_STR; |
84 | 93 | modules = NODE_STRINGIFY(NODE_MODULE_VERSION); |
85 | 94 | nghttp2 = NGHTTP2_VERSION; |
|