Skip to content

Commit

Permalink
fix(deps): remove dynamic linking to 'lzma' (#2631)
Browse files Browse the repository at this point in the history
  • Loading branch information
universalmind303 authored Feb 9, 2024
1 parent 0671822 commit 4814ab7
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion benchmarks/tpch/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
maturin==1.0.1
virtualenv==20.23.1
ruff==0.0.275
ruff==0.2.1
black==23.3.0
blackdoc==0.3.8
mypy==1.3.0
Expand Down
2 changes: 2 additions & 0 deletions bindings/nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ bytes = "1.5.0"
serde.workspace = true
serde_json.workspace = true

# Prevent dynamic linking of lzma, which comes from datafusion
lzma-sys = { version = "*", features = ["static"] }

[build-dependencies]
napi-build = "2.1.0"
3 changes: 3 additions & 0 deletions bindings/python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ futures = { workspace = true }
uuid = "1.7.0"
async-trait = { workspace = true }
once_cell = "1.19.0"

# Prevent dynamic linking of lzma, which comes from datafusion
lzma-sys = { version = "*", features = ["static"] }
3 changes: 3 additions & 0 deletions crates/glaredb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ tokio-postgres = "0.7.8"
uuid = { version = "1.7.0", features = ["v4", "fast-rng", "macro-diagnostics"] }
glob = "0.3.1"

# Prevent dynamic linking of lzma, which comes from datafusion
lzma-sys = { version = "*", features = ["static"] }

[dev-dependencies]
predicates = "3.1.0"
assert_cmd = "2.0.13"
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/test_smoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_expected_linking_linux(debug_path: pathlib.Path):
)
]
expected_prefix = ["libc.so", "libm.so", "linux-vdso"]
possible_libs = ["liblzma", "libbz", "libgcc"]
possible_libs = ["libbz", "libgcc"]
pending_removal = ["libcrypto", "libssl"]
expected = 0
possible = 0
Expand Down

0 comments on commit 4814ab7

Please sign in to comment.