Delete repeated changes to the rustflags in .cargo/config

This commit is contained in:
yezengruan 2022-08-24 09:32:06 +08:00
parent ee65f664cb
commit ad92b6d4af

View File

@ -6,7 +6,7 @@
Name: stratovirt Name: stratovirt
Version: 2.2.0 Version: 2.2.0
Release: 3 Release: 4
Summary: StratoVirt is an opensource VMM(Virtual Machine Manager) which aims to perform next generation virtualization. Summary: StratoVirt is an opensource VMM(Virtual Machine Manager) which aims to perform next generation virtualization.
License: Mulan PSL v2 License: Mulan PSL v2
@ -51,20 +51,20 @@ Summary: %{summary}
%ifarch aarch64 %ifarch aarch64
sed -i '/\[build\]/a target="aarch64-unknown-linux-musl"' ./.cargo/config sed -i '/\[build\]/a target="aarch64-unknown-linux-musl"' ./.cargo/config
sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", "-Clink-arg=-lpixman-1", /' ./.cargo/config
%endif %endif
%ifarch x86_64 %ifarch x86_64
sed -i '/\[build\]/a target="x86_64-unknown-linux-musl"' ./.cargo/config sed -i '/\[build\]/a target="x86_64-unknown-linux-musl"' ./.cargo/config
sed -i 's/rustflags = \[/&"-Clink-arg=-lpixman-1", /' ./.cargo/config
%endif %endif
sed -i '/\[source.crates-io\]/{n;d}' ./.cargo/config sed -i '/\[source.crates-io\]/{n;d}' ./.cargo/config
sed -i '/\[source.local-registry\]/{n;d}' ./.cargo/config sed -i '/\[source.local-registry\]/{n;d}' ./.cargo/config
sed -i '/\[source.local-registry\]/a directory = "vendor"' ./.cargo/config sed -i '/\[source.local-registry\]/a directory = "vendor"' ./.cargo/config
%ifarch aarch64 %ifarch aarch64
sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", /g' ./.cargo/config sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config
%endif %endif
sed -i 's/rustflags = \[/&"-Clink-arg=-lpixman-1", /' ./.cargo/config
%cargo_build -a %cargo_build -a
@ -74,6 +74,9 @@ chmod 555 ${RPM_BUILD_ROOT}/usr/bin/stratovirt
chmod 555 ${RPM_BUILD_ROOT}/usr/bin/ozone chmod 555 ${RPM_BUILD_ROOT}/usr/bin/ozone
%changelog %changelog
* Wed Aug 24 2022 yezengruan <yezengruan@huawei.com> - 2.2.0-4
- Delete repeated changes to the rustflags in .cargo/config
* Tue Aug 23 2022 yezengruan <yezengruan@huawei.com> - 2.2.0-3 * Tue Aug 23 2022 yezengruan <yezengruan@huawei.com> - 2.2.0-3
- Update to StratoVirt 2.2.0-rc3 - Update to StratoVirt 2.2.0-rc3
- Support VNC, usb keyboard, usb tablet, and virtio-gpu - Support VNC, usb keyboard, usb tablet, and virtio-gpu