Merge branch 'tomas/win-build-2' (#2100)

* origin/tomas/win-build-2: changelog: #2100 rm jemalloc from rocksdb workspace features
anoma · Nov 11, 2023 · b711fd2 · b711fd2
2 parents d3d88a9 + 5f6faef
commit b711fd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.changelog/unreleased/bug-fixes/2100-win-build.md b/.changelog/unreleased/bug-fixes/2100-win-build.md
@@ -0,0 +1,2 @@
+- Fix Windows build by disabling RocksDB jemalloc feature.
+  ([\#2100](https://github.com/anoma/namada/pull/2100))
diff --git a/Cargo.toml b/Cargo.toml
@@ -114,7 +114,7 @@ regex = "1.4.5"
 reqwest = "0.11.4"
 ripemd = "0.1"
 rlimit = "0.5.4"
-rocksdb = {version = "0.21.0", features = ['zstd', 'jemalloc'], default-features = false}
+rocksdb = {version = "0.21.0", features = ['zstd'], default-features = false}
 rpassword = "5.0.1"
 serde = {version = "1.0.125", features = ["derive"]}
 serde_bytes = "0.11.5"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Fix Windows build by disabling RocksDB jemalloc feature.
		([\#2100](https://github.com/anoma/namada/pull/2100))