Commit 97aa67f
committed
src: fix dynamically linked zlib version
Report the version of the dynamically linked zlib if built with
`configure --shared-zlib` instead of the hardcoded version that
corresponds to the bundled version of zlib in `deps`.
PR-URL: #51007
Refs: #50910
Refs: #50158
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent 6a8ff09 commit 97aa67f
2 files changed
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -141,6 +141,7 @@ | |||
| 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': { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,12 @@ | |||
| 14 | 14 | #include "uv.h" | |
| 15 | 15 | #include "uvwasi.h" | |
| 16 | 16 | #include "v8.h" | |
| 17 | + | ||
| 18 | + #ifdef NODE_BUNDLED_ZLIB | ||
| 17 | 19 | #include "zlib_version.h" | |
| 20 | + #else | ||
| 21 | + #include <zlib.h> | ||
| 22 | + #endif // NODE_BUNDLED_ZLIB | ||
| 18 | 23 | ||
| 19 | 24 | #if HAVE_OPENSSL | |
| 20 | 25 | #include <openssl/opensslv.h> | |
@@ -78,7 +83,11 @@ Metadata::Versions::Versions() { | |||
| 78 | 83 | node = NODE_VERSION_STRING; | |
| 79 | 84 | v8 = v8::V8::GetVersion(); | |
| 80 | 85 | uv = uv_version_string(); | |
| 86 | + #ifdef NODE_BUNDLED_ZLIB | ||
| 81 | 87 | zlib = ZLIB_VERSION; | |
| 88 | + #else | ||
| 89 | + zlib = zlibVersion(); | ||
| 90 | + #endif // NODE_BUNDLED_ZLIB | ||
| 82 | 91 | ares = ARES_VERSION_STR; | |
| 83 | 92 | modules = NODE_STRINGIFY(NODE_MODULE_VERSION); | |
| 84 | 93 | nghttp2 = NGHTTP2_VERSION; | |
0 commit comments