Remove frozen-abi build script (anza-xyz#2911)

* replace cfg(RUSTC_WITH_SPECIALIZATION) with cfg(feature = "frozen-abi") * remove the build scripts for the two frozen-abi crates * remove all rustc_version deps * remove a rustc_version dep that I missed * fix duplicate lines in Cargo.toml files * remove build.rs from instruction crate * remove rustc_version from instruction crate * remove no-longer-needed check-cfg entries * update lock file after rebase
aerius-labs · Sep 17, 2024 · 6082e84 · 6082e84
1 parent c4b42ab
commit 6082e84
Show file tree

Hide file tree

Showing 107 changed files with 210 additions and 356 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -178,8 +178,6 @@ level = "warn"
 check-cfg = [
     'cfg(target_os, values("solana"))',
     'cfg(feature, values("frozen-abi", "no-entrypoint"))',
-    'cfg(RUSTC_WITH_SPECIALIZATION)',
-    'cfg(RUSTC_WITHOUT_SPECIALIZATION)',
 ]
 
 [workspace.dependencies]
@@ -338,7 +336,6 @@ reqwest = { version = "0.11.27", default-features = false }
 reqwest-middleware = "0.2.5"
 rolling-file = "0.2.0"
 rpassword = "7.3"
-rustc_version = "0.4"
 rustls = { version = "0.23.13", default-features = false }
 scopeguard = "1.2.0"
 semver = "1.0.23"

diff --git a/accounts-db/Cargo.toml b/accounts-db/Cargo.toml
@@ -37,8 +37,12 @@ serde = { workspace = true, features = ["rc"] }
 serde_derive = { workspace = true }
 smallvec = { workspace = true, features = ["const_generics"] }
 solana-bucket-map = { workspace = true }
-solana-frozen-abi = { workspace = true, optional = true }
-solana-frozen-abi-macro = { workspace = true, optional = true }
+solana-frozen-abi = { workspace = true, optional = true, features = [
+    "frozen-abi",
+] }
+solana-frozen-abi-macro = { workspace = true, optional = true, features = [
+    "frozen-abi",
+] }
 solana-inline-spl = { workspace = true }
 solana-lattice-hash = { workspace = true }
 solana-measure = { workspace = true }
@@ -79,17 +83,13 @@ test-case = { workspace = true }
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
-[build-dependencies]
-rustc_version = { workspace = true, optional = true }
-
 [features]
 dev-context-only-utils = [
     "dep:qualifier_attr",
     "dep:solana-stake-program",
     "dep:solana-vote-program",
 ]
 frozen-abi = [
-    "dep:rustc_version",
     "dep:solana-frozen-abi",
     "dep:solana-frozen-abi-macro",
     "solana-sdk/frozen-abi",

diff --git a/accounts-db/build.rs b/accounts-db/build.rs
diff --git a/accounts-db/src/accounts_db.rs b/accounts-db/src/accounts_db.rs
@@ -2415,7 +2415,7 @@ pub fn make_min_priority_thread_pool() -> ThreadPool {
         .unwrap()
 }
 
-#[cfg(all(RUSTC_WITH_SPECIALIZATION, feature = "frozen-abi"))]
+#[cfg(feature = "frozen-abi")]
 impl solana_frozen_abi::abi_example::AbiExample for AccountsDb {
     fn example() -> Self {
         let accounts_db = AccountsDb::new_single_for_tests();

diff --git a/accounts-db/src/lib.rs b/accounts-db/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(min_specialization))]
+#![cfg_attr(feature = "frozen-abi", feature(min_specialization))]
 #![allow(clippy::arithmetic_side_effects)]
 
 #[macro_use]

diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml
@@ -16,8 +16,12 @@ log = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true, features = ["rc"] }
 serde_derive = { workspace = true }
-solana-frozen-abi = { workspace = true, optional = true }
-solana-frozen-abi-macro = { workspace = true, optional = true }
+solana-frozen-abi = { workspace = true, optional = true, features = [
+    "frozen-abi",
+] }
+solana-frozen-abi-macro = { workspace = true, optional = true, features = [
+    "frozen-abi",
+] }
 solana-sanitize = { workspace = true }
 solana-sdk = { workspace = true }
 
@@ -31,12 +35,8 @@ name = "solana_bloom"
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
-[build-dependencies]
-rustc_version = { workspace = true, optional = true }
-
 [features]
 frozen-abi = [
-    "dep:rustc_version",
     "dep:solana-frozen-abi",
     "dep:solana-frozen-abi-macro",
     "solana-sdk/frozen-abi",

diff --git a/bloom/build.rs b/bloom/build.rs
diff --git a/bloom/src/lib.rs b/bloom/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(min_specialization))]
+#![cfg_attr(feature = "frozen-abi", feature(min_specialization))]
 pub mod bloom;
 
 #[cfg_attr(feature = "frozen-abi", macro_use)]

diff --git a/builtins-default-costs/Cargo.toml b/builtins-default-costs/Cargo.toml
@@ -17,7 +17,9 @@ solana-address-lookup-table-program = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-compute-budget-program = { workspace = true }
 solana-config-program = { workspace = true }
-solana-frozen-abi = { workspace = true, optional = true }
+solana-frozen-abi = { workspace = true, optional = true, features = [
+    "frozen-abi",
+] }
 solana-loader-v4-program = { workspace = true }
 solana-sdk = { workspace = true }
 solana-stake-program = { workspace = true }
@@ -35,12 +37,8 @@ rand = "0.8.5"
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
-[build-dependencies]
-rustc_version = { workspace = true, optional = true }
-
 [features]
 frozen-abi = [
-    "dep:rustc_version",
     "dep:solana-frozen-abi",
     "solana-vote-program/frozen-abi",
 ]

diff --git a/builtins-default-costs/build.rs b/builtins-default-costs/build.rs
diff --git a/builtins-default-costs/src/lib.rs b/builtins-default-costs/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(min_specialization))]
+#![cfg_attr(feature = "frozen-abi", feature(min_specialization))]
 #![allow(clippy::arithmetic_side_effects)]
 use {
     ahash::AHashMap,

diff --git a/cargo-registry/Cargo.toml b/cargo-registry/Cargo.toml
@@ -39,8 +39,5 @@ toml = { workspace = true }
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
-[build-dependencies]
-rustc_version = { workspace = true, optional = true }
-
 [features]
 dev-context-only-utils = []