diff options
| author | Matt Mastracci <matthew@mastracci.com> | 2023-11-11 07:20:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 07:20:12 -0700 |
| commit | 56e76242f3d7082e412bc698ebc737d24910cb60 (patch) | |
| tree | 1b7fc048e1a873b5b6d05870cd3485811966f671 /cli | |
| parent | 0c1ab2c7f7a6ebf7856df71dbd790d0d731f1b86 (diff) | |
chore(ext/node): use libz-sys w/`zlib-ng` feature in node (#21158)
We only want one zlib dependency.
Zlib dependencies are reorganized so they use a hidden
`__vendored_zlib_ng` flag in cli that enables zlib-ng for both libz-sys
(used by ext/node) and flate2 (used by deno_web).
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/Cargo.toml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b7aed6b12..3df736ac3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -27,9 +27,12 @@ harness = false path = "./bench/lsp_bench_standalone.rs" [features] +default = ["__vendored_zlib_ng"] # A dev feature to disable creations and loading of snapshots in favor of # loading JS sources at runtime. __runtime_js_sources = ["deno_runtime/__runtime_js_sources"] +# Vendor zlib as zlib-ng +__vendored_zlib_ng = ["flate2/zlib-ng-compat", "libz-sys/zlib-ng"] [build-dependencies] deno_runtime = { workspace = true, features = ["exclude_runtime_main_js", "include_js_files_for_snapshotting"] } @@ -39,6 +42,7 @@ serde.workspace = true serde_json.workspace = true zstd.workspace = true glibc_version = "0.1.2" +flate2 = { workspace = true, features = ["default"] } [target.'cfg(windows)'.build-dependencies] winapi.workspace = true @@ -84,6 +88,7 @@ encoding_rs.workspace = true env_logger = "=0.10.0" fancy-regex = "=0.10.0" fastwebsockets.workspace = true +# If you disable the default __vendored_zlib_ng feature above, you _must_ be able to link against `-lz`. flate2.workspace = true fs3.workspace = true glob = "0.3.1" @@ -95,6 +100,7 @@ indexmap.workspace = true jsonc-parser = { version = "=0.21.1", features = ["serde"] } lazy-regex.workspace = true libc.workspace = true +libz-sys.workspace = true log = { workspace = true, features = ["serde"] } lsp-types.workspace = true monch.workspace = true |