From e85981794b1e2d4ea5dee6907b147b8a9810d67c Mon Sep 17 00:00:00 2001 From: liuxiangdong Date: Fri, 10 Mar 2023 06:08:35 +0800 Subject: [PATCH] spec: add -static-pie for musl Add -static-pie for musl. Signed-off-by: liuxiangdong --- stratovirt.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stratovirt.spec b/stratovirt.spec index 968a775..18372a6 100644 --- a/stratovirt.spec +++ b/stratovirt.spec @@ -6,7 +6,7 @@ Name: stratovirt Version: 2.2.0 -Release: 12 +Release: 13 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", \]' ./.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 %ifarch aarch64 sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config @@ -90,6 +90,7 @@ 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 @@ -108,6 +109,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 +* Sat Mar 11 2023 liuxiangdong - 2.2.0-13 +- add -static-pie for musl + * Tue Mar 07 2023 yezengruan - 2.2.0-12 - Pack vhost_user_fs into rpm package -- Gitee