From 8e51fe8d1a57619f2222724e405f2527a99c2aa7 Mon Sep 17 00:00:00 2001 From: Gan Qixin Date: Fri, 8 Sep 2023 13:09:25 +0800 Subject: [PATCH] Revert "spec: add -static-pie for musl" This reverts commit b813f90cc9d48476cc9aab3ceae0c6eec1baa1c4. --- stratovirt.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stratovirt.spec b/stratovirt.spec index 18372a6..885ddd7 100644 --- a/stratovirt.spec +++ b/stratovirt.spec @@ -6,7 +6,7 @@ Name: stratovirt Version: 2.2.0 -Release: 13 +Release: 14 Summary: StratoVirt is an opensource VMM(Virtual Machine Manager) which aims to perform next generation virtualization. License: MulanPSL-2.0 @@ -82,7 +82,7 @@ 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 sed -i '/^rustflags/d' ./.cargo/config -sed -i '/\[build\]/arustflags = \["-Copt-level=3", "-Cdebuginfo=2", "-Clink-arg=-Wl,-z,relro,-z,now", "-Ccodegen-units=1", "--cap-lints=warn", "-Clink-arg=-static-pie", \]' ./.cargo/config +sed -i '/\[build\]/arustflags = \["-Copt-level=3", "-Cdebuginfo=2", "-Clink-arg=-Wl,-z,relro,-z,now", "-Ccodegen-units=1", "--cap-lints=warn", \]' ./.cargo/config %ifarch aarch64 sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config @@ -90,7 +90,6 @@ sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config %{_cargo} build --release -Z avoid-dev-deps --target=%{rust_musl_target} --all-features -sed -i 's/ \"-Clink-arg=-static-pie\"\,//g' ./.cargo/config sed -i 's/rustflags = \[/&"-Clink-arg=-lpixman-1", /' ./.cargo/config %{_cargo} build --release -Z avoid-dev-deps --target=%{rust_gnu_target} --all-features @@ -109,6 +108,9 @@ install -D -m555 ./target/%{rust_musl_target}/release/stratovirt %{buildroot}%{_ install -D -m555 ./target/%{rust_musl_target}/release/vhost_user_fs %{buildroot}%{_libdir}/stratovirt/static %changelog +* Mon Sep 11 2023 ganqixin - 2.2.0-14 +- Delete -static-pie for musl + * Sat Mar 11 2023 liuxiangdong - 2.2.0-13 - add -static-pie for musl -- Gitee