From ad92b6d4af7b0d74efd82467b55775164fd85094 Mon Sep 17 00:00:00 2001 From: yezengruan Date: Wed, 24 Aug 2022 09:32:06 +0800 Subject: [PATCH] Delete repeated changes to the rustflags in .cargo/config --- stratovirt.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/stratovirt.spec b/stratovirt.spec index c54020d..c7a508a 100644 --- a/stratovirt.spec +++ b/stratovirt.spec @@ -6,7 +6,7 @@ Name: stratovirt Version: 2.2.0 -Release: 3 +Release: 4 Summary: StratoVirt is an opensource VMM(Virtual Machine Manager) which aims to perform next generation virtualization. License: Mulan PSL v2 @@ -51,20 +51,20 @@ Summary: %{summary} %ifarch aarch64 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 %ifarch x86_64 sed -i '/\[build\]/a target="x86_64-unknown-linux-musl"' ./.cargo/config -sed -i 's/rustflags = \[/&"-Clink-arg=-lpixman-1", /' ./.cargo/config %endif sed -i '/\[source.crates-io\]/{n;d}' ./.cargo/config sed -i '/\[source.local-registry\]/{n;d}' ./.cargo/config sed -i '/\[source.local-registry\]/a directory = "vendor"' ./.cargo/config + %ifarch aarch64 -sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", /g' ./.cargo/config +sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config %endif +sed -i 's/rustflags = \[/&"-Clink-arg=-lpixman-1", /' ./.cargo/config %cargo_build -a @@ -74,6 +74,9 @@ chmod 555 ${RPM_BUILD_ROOT}/usr/bin/stratovirt chmod 555 ${RPM_BUILD_ROOT}/usr/bin/ozone %changelog +* Wed Aug 24 2022 yezengruan - 2.2.0-4 +- Delete repeated changes to the rustflags in .cargo/config + * Tue Aug 23 2022 yezengruan - 2.2.0-3 - Update to StratoVirt 2.2.0-rc3 - Support VNC, usb keyboard, usb tablet, and virtio-gpu