adjust building with aws-lc-sys

PR bpfman#1406 bumped the version of sigstore from 0.10.0 to 0.11.0. That bump also brought in a dependency on aws-lc-rs. Several subsequent PRs fixed RPM build failures do to aws-lc-rs (bpfman#1407 and bpfman#1410). Now downstream OpenShift builds of bpfman are failing on certain arches. Attempting a workaround to the downstream failures by changing the asw-lc-rs feature flags. Ultimately, aws-lc-rs should not be a dependency, see: sigstore/sigstore-rs#436 Signed-off-by: Billy McFall <[email protected]>
Billy99 · Feb 14, 2025 · 93df322 · 93df322
1 parent 1a501b9
commit 93df322
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ anyhow = { version = "1", default-features = false }
 assert_cmd = { version = "2", default-features = false }
 assert_matches = { version = "1", default-features = false }
 async-trait = { version = "0.1", default-features = false }
-aws-lc-rs = { version = "1.12.2", default-features = false }
+aws-lc-rs = { version = "1", default-features = false }
 aya = { version = "0.13.1", default-features = false }
 aya-obj = { version = "0.2.1", default-features = false }
 base16ct = { version = "0.2.0", default-features = false }

diff --git a/bpfman-api/Cargo.toml b/bpfman-api/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/bin/rpc/main.rs"
 [dependencies]
 anyhow = { workspace = true, features = ["std"] }
 async-trait = { workspace = true }
-aws-lc-rs = { workspace = true, features = ["bindgen"] }
+aws-lc-rs = { workspace = true, features = ["prebuilt-nasm"] }
 aya = { workspace = true }
 base16ct = { workspace = true, features = ["alloc"] }
 base64 = { workspace = true }

diff --git a/bpfman.spec b/bpfman.spec
@@ -32,8 +32,6 @@ BuildRequires:  systemd-rpm-macros
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  gcc
-BuildRequires:  cmake
-BuildRequires:  clang-devel
 
 # TODO: Generate Provides for all of the vendored dependencies