!98 [sync] PR-97: Revert "spec: add -static-pie for musl"
From: @openeuler-sync-bot Reviewed-by: @yezengruan Signed-off-by: @yezengruan
This commit is contained in:
commit
ae217e55f1
@ -6,7 +6,7 @@
|
||||
|
||||
Name: stratovirt
|
||||
Version: 2.2.0
|
||||
Release: 14
|
||||
Release: 15
|
||||
Summary: StratoVirt is an opensource VMM(Virtual Machine Manager) which aims to perform next generation virtualization.
|
||||
|
||||
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\]/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
|
||||
@ -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
|
||||
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
%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
|
||||
- Diable VIRTIO_F_ACCESS_PLATFORM feature in vsock
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user