packages/stratovirt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!98 [sync] PR-97: Revert "spec: add -static-pie for musl"

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @yezengruan 
Signed-off-by: @yezengruan
This commit is contained in:
openeuler-ci-bot 2023-09-11 08:23:51 +00:00 committed by Gitee
commit ae217e55f1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stratovirt.spec
View File

@ -6,7 +6,7 @@
Name: stratovirt Name: stratovirt
Version: 2.2.0 Version: 2.2.0
Release: 14 Release: 15
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
@ -83,7 +83,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", "-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 %ifarch aarch64
sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config sed -i 's/rustflags = \[/&"-Clink-arg=-lgcc", /' ./.cargo/config
@ -91,7 +91,6 @@ 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
@ -110,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
* Fri Sep 8 2023 ganqixin <ganqixin@huawei.com> - 2.2.0-15
- Delete -static-pie for musl
* Fri Sep 1 2023 Yan Wang <wangyan122@huawei.com> - 2.2.0-14 * Fri Sep 1 2023 Yan Wang <wangyan122@huawei.com> - 2.2.0-14
- Diable VIRTIO_F_ACCESS_PLATFORM feature in vsock - Diable VIRTIO_F_ACCESS_PLATFORM feature in vsock