!92 spec: add -static-pie for musl

From: @aven6 
Reviewed-by: @yezengruan 
Signed-off-by: @yezengruan
This commit is contained in:
openeuler-ci-bot 2023-03-12 01:17:31 +00:00 committed by Gitee
commit a75c8394c1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -6,7 +6,7 @@
Name: stratovirt Name: stratovirt
Version: 2.2.0 Version: 2.2.0
Release: 12 Release: 13
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: MulanPSL-2.0 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\]/{n;d}' ./.cargo/config
sed -i '/\[source.local-registry\]/a directory = "vendor"' ./.cargo/config sed -i '/\[source.local-registry\]/a directory = "vendor"' ./.cargo/config
sed -i '/^rustflags/d' ./.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 %ifarch aarch64
sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config 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 %{_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 sed -i 's/rustflags = \[/&"-Clink-arg=-lpixman-1", /' ./.cargo/config
%{_cargo} build --release -Z avoid-dev-deps --target=%{rust_gnu_target} --all-features %{_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 install -D -m555 ./target/%{rust_musl_target}/release/vhost_user_fs %{buildroot}%{_libdir}/stratovirt/static
%changelog %changelog
* Sat Mar 11 2023 liuxiangdong <liuxiangdong5@huawei.com> - 2.2.0-13
- add -static-pie for musl
* Tue Mar 07 2023 yezengruan <yezengruan@huawei.com> - 2.2.0-12 * Tue Mar 07 2023 yezengruan <yezengruan@huawei.com> - 2.2.0-12
- Pack vhost_user_fs into rpm package - Pack vhost_user_fs into rpm package