diff --git a/anda/rust/zellij/rust-zellij.spec b/anda/rust/zellij/rust-zellij.spec index 8a565a5b42..12592cae44 100644 --- a/anda/rust/zellij/rust-zellij.spec +++ b/anda/rust/zellij/rust-zellij.spec @@ -1,48 +1,7 @@ # Generated by rust2rpm 22 %global debug_package %{nil} %bcond_without check -%define sccache_prep (\ -export CC="%{_sccache} gcc" \ -export CXX="%{_sccache} g++" \ -export RUSTC_WRAPPER="sccache" \ -\ -export SCCACHE_BUCKET=%{?sccache_bucket}\ -export SCCACHE_ENDPOINT=%{?sccache_endpoint}\ -export AWS_SECRET_ACCESS_KEY=%{?sccache_secret}\ -export AWS_ACCESS_KEY_ID=%{?sccache_accesskey}\ -export SCCACHE_S3_USE_SSL=true\ -) - -%define cargo_prep_online_sccache (\ -set -eu \ -%{__mkdir} -p .cargo \ -cat > .cargo/config << EOF \ -[build]\ -rustc = "%{__rustc}"\ -rustc-wrapper = "%{_sccache}"\ -rustdoc = "%{__rustdoc}"\ -\ -[env]\ -CFLAGS = "%{build_cflags}"\ -CXXFLAGS = "%{build_cxxflags}"\ -LDFLAGS = "%{build_ldflags}"\ -\ -[install]\ -root = "%{buildroot}%{_prefix}"\ -\ -[term]\ -verbose = true\ -\ -[source]\ -\ -[source.local-registry]\ -directory = "%{cargo_registry}"\ -\ -EOF\ -%{__rm} -f Cargo.lock \ -%{__rm} -f Cargo.toml.orig \ -) %global crate zellij Name: rust-zellij @@ -59,7 +18,6 @@ ExclusiveArch: %{rust_arches} BuildRequires: anda-srpm-macros BuildRequires: rust-packaging BuildRequires: openssl-devel -BuildRequires: sccache #BuildRequires: external:crate:sccache @@ -80,11 +38,10 @@ Summary: %{summary} %prep %autosetup -n %{crate}-%{version_no_tilde} -%cargo_prep_online_sccache +%cargo_prep_online %build -%sccache_prep %cargo_build %install