[skip-ci] RPM: use default __cargo macro across all envs

On C9S and RHEL9, we've been specifying our own cargo macro which fails to create debuginfo packages with rust 1.77.2. Ref: https://blog.rust-lang.org/2024/03/21/Rust-1.77.0.html#enable-strip-in-release-profiles-by-default This can be remedied by simply using the default __cargo macro provided on build environments. Signed-off-by: Lokesh Mandvekar <[email protected]>
containers · May 14, 2024 · abdd8ec · abdd8ec
1 parent 967304f
commit abdd8ec
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/rpm/netavark.spec b/rpm/netavark.spec
@@ -2,14 +2,6 @@
 # Latest upstream rtnetlink frequently required
 # sha2, zbus, zvariant are currently out of date
 
-# RHEL doesn't include the package rust-packaging which provides %%__cargo macro, but EPEL
-# does. So we set it separately here and skip rust-packaging dependency for RHEL.
-# Buildability without EPEL is essential for packit builds.
-# ELN doesn't need this.
-%if %{defined rhel} && 0%{?rhel} < 10
-%define __cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Clink-arg=-Wl,-z,relro -Clink-arg=-Wl,-z,now --cap-lints=warn' %{_bindir}/cargo
-%endif
-
 %global with_debug 1
 
 %if 0%{?with_debug}