chore/rocksdb: contain the rocksdb build.rs fixup (#1762)

drahnr · web-flow · commit 4bec7df7322b · 2026-03-09T22:02:45.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/network-monitor/Cargo.toml b/bin/network-monitor/Cargo.toml
@@ -37,6 +37,3 @@ tonic            = { features = ["codegen", "tls-native-roots", "transport"], wo
 tonic-health     = { workspace = true }
 tracing          = { workspace = true }
 url              = { features = ["serde"], workspace = true }
-
-[build-dependencies]
-miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml
@@ -33,8 +33,5 @@ miden-protocol            = { workspace = true }
 tokio                     = { features = ["macros", "net", "rt-multi-thread"], workspace = true }
 url                       = { workspace = true }
 
-[build-dependencies]
-miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
-
 [dev-dependencies]
 miden-node-utils = { features = ["tracing-forest"], workspace = true }
diff --git a/bin/node/build.rs b/bin/node/build.rs
diff --git a/bin/remote-prover/Cargo.toml b/bin/remote-prover/Cargo.toml
@@ -48,12 +48,11 @@ miden-tx        = { features = ["testing"], workspace = true }
 serial_test     = { version = "3" }
 
 [build-dependencies]
-build-rs                           = { workspace = true }
-fs-err                             = { workspace = true }
-miden-node-proto-build             = { features = ["internal"], workspace = true }
-miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
-miette                             = { features = ["fancy"], version = "7.5" }
-tonic-prost-build                  = { workspace = true }
+build-rs               = { workspace = true }
+fs-err                 = { workspace = true }
+miden-node-proto-build = { features = ["internal"], workspace = true }
+miette                 = { features = ["fancy"], version = "7.5" }
+tonic-prost-build      = { workspace = true }
 
 [package.metadata.cargo-machete]
 ignored = [
diff --git a/bin/remote-prover/build.rs b/bin/remote-prover/build.rs
@@ -7,8 +7,6 @@ use tonic_prost_build::FileDescriptorSet;
 
 /// Generates Rust protobuf bindings.
 fn main() -> miette::Result<()> {
-    miden_node_rocksdb_cxx_linkage_fix::configure();
-
     let dst_dir = build_rs::input::out_dir().join("generated");
 
     // Remove all existing files.
diff --git a/bin/stress-test/Cargo.toml b/bin/stress-test/Cargo.toml
@@ -32,6 +32,3 @@ rayon                     = { version = "1.10" }
 tokio                     = { workspace = true }
 tonic                     = { default-features = true, workspace = true }
 url                       = { workspace = true }
-
-[build-dependencies]
-miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
diff --git a/bin/stress-test/build.rs b/bin/stress-test/build.rs
diff --git a/crates/large-smt-backend-rocksdb/Cargo.toml b/crates/large-smt-backend-rocksdb/Cargo.toml
@@ -20,3 +20,6 @@ miden-protocol = { features = ["std"], workspace = true }
 rayon          = { version = "1.10" }
 rocksdb        = { default-features = false, features = ["bindgen-runtime", "lz4"], version = "0.24" }
 winter-utils   = { version = "0.13" }
+
+[build-dependencies]
+miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
diff --git a/crates/large-smt-backend-rocksdb/build.rs b/crates/large-smt-backend-rocksdb/build.rs
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
@@ -33,12 +33,11 @@ assert_matches = { workspace = true }
 proptest       = { version = "1.7" }
 
 [build-dependencies]
-build-rs                           = { workspace = true }
-fs-err                             = { workspace = true }
-miden-node-proto-build             = { features = ["internal"], workspace = true }
-miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
-miette                             = { version = "7.6" }
-tonic-prost-build                  = { workspace = true }
+build-rs               = { workspace = true }
+fs-err                 = { workspace = true }
+miden-node-proto-build = { features = ["internal"], workspace = true }
+miette                 = { version = "7.6" }
+tonic-prost-build      = { workspace = true }
 
 [package.metadata.cargo-machete]
 ignored = [
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
@@ -15,8 +15,6 @@ use tonic_prost_build::FileDescriptorSet;
 
 /// Generates Rust protobuf bindings using `miden-node-proto-build`.
 fn main() -> miette::Result<()> {
-    miden_node_rocksdb_cxx_linkage_fix::configure();
-
     let dst_dir = build_rs::input::out_dir().join("generated");
 
     // Remove all existing files.
diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml
@@ -51,12 +51,11 @@ tracing           = { workspace = true }
 url               = { workspace = true }
 
 [build-dependencies]
-build-rs                           = { workspace = true }
-fs-err                             = { workspace = true }
-miden-agglayer                     = { features = ["testing"], version = "=0.14.0-alpha.1" }
-miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
-miden-protocol                     = { features = ["std"], workspace = true }
-miden-standards                    = { workspace = true }
+build-rs        = { workspace = true }
+fs-err          = { workspace = true }
+miden-agglayer  = { features = ["testing"], version = "=0.14.0-alpha.1" }
+miden-protocol  = { features = ["std"], workspace = true }
+miden-standards = { workspace = true }
 
 [dev-dependencies]
 assert_matches        = { workspace = true }
diff --git a/crates/store/build.rs b/crates/store/build.rs
@@ -26,7 +26,6 @@ fn main() {
 
     // Generate sample agglayer account files for genesis config samples.
     generate_agglayer_sample_accounts();
-    miden_node_rocksdb_cxx_linkage_fix::configure();
 }
 
 /// Generates sample agglayer account files for the `02-with-account-files` genesis config sample.
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
@@ -45,8 +45,5 @@ tracing-opentelemetry = { version = "0.32" }
 tracing-subscriber    = { workspace = true }
 url                   = { workspace = true }
 
-[build-dependencies]
-miden-node-rocksdb-cxx-linkage-fix = { workspace = true }
-
 [dev-dependencies]
 thiserror = { workspace = true }
diff --git a/crates/utils/build.rs b/crates/utils/build.rs
