Skip to content

Commit

Permalink
Merge branch 'tomas/win-build' (#2047)
Browse files Browse the repository at this point in the history
* origin/tomas/win-build:
  changelog: add #2047
  apps: turn off rocksdb jemalloc on windows
  • Loading branch information
brentstone committed Nov 11, 2023
2 parents 6f566ad + af008cd commit 079c5f8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/2047-win-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix Windows build by disabling RocksDB jemalloc feature.
([\#2047](https://github.com/anoma/namada/pull/2047))
8 changes: 6 additions & 2 deletions apps/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ regex.workspace = true
reqwest.workspace = true
ripemd.workspace = true
rlimit.workspace = true
rocksdb.workspace = true
rpassword.workspace = true
serde_bytes.workspace = true
serde_json = {workspace = true, features = ["raw_value"]}
Expand All @@ -143,10 +142,15 @@ tracing-subscriber = { workspace = true, features = ["std", "json", "ansi", "tra
tracing.workspace = true
winapi.workspace = true
zeroize.workspace = true

warp = "0.3.2"
bytes = "1.1.0"

[target.'cfg(not(windows))'.dependencies]
rocksdb = { workspace = true, features = ['jemalloc'] } # jemalloc is not supported on windows

[target.'cfg(windows)'.dependencies]
rocksdb = { workspace = true }

[dev-dependencies]
assert_matches = "1.5.0"
namada = {path = "../shared", default-features = false, features = ["testing", "wasm-runtime"]}
Expand Down

0 comments on commit 079c5f8

Please sign in to comment.