mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-01 10:31:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-lang/rust: fix build issue with Rust 1.61.0

Browse Source 
Fix build issues with Rust 1.61.0 when applying
gentoo-musl-target-specs.patch.

```
error[E0308]: mismatched types
 -->
 compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs:6:24
  |
6 |     base.llvm_target =
   "aarch64-gentoo-linux-musl".to_string();
  |     ---------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  expected enum `Cow`, found struct `std::string::String`
  |     |
  |     expected due to the type of this binding
  |
  = note: expected enum `Cow<'static, str>`
           found struct `std::string::String`
```

Replace `to_string` with `into`.

Based on Gentoo commit 445f23597c942b087145b869ac588fc1c1eac759.
This commit is contained in:
Dongsu Park 2022-05-25 09:40:19 +02:00
parent 4de751cb1a
commit 6314760a57
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.49.0-gentoo-musl-target-specs.patch → sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.61.0-gentoo-musl-target-specs.patch vendored
View File

@ -1,21 +1,23 @@
From 671ef2d1c228aed031b4232b8bea96f17b825263 Mon Sep 17 00:00:00 2001 From 331c3839ebb0099101e1d2f88205ea42f4e3b319 Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org> From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Mon, 23 Nov 2020 14:52:04 -0800 Date: Tue, 24 May 2022 12:03:20 -0700
Subject: [PATCH] add gentoo musl target specs Subject: [PATCH] add gentoo musl target specs
--- ---
.../src/spec/aarch64_gentoo_linux_musl.rs | 11 +++++++++++ .../src/spec/aarch64_gentoo_linux_musl.rs | 11 +
.../src/spec/armv7_gentoo_linux_musleabihf.rs | 11 +++++++++++ .../src/spec/armv7_gentoo_linux_musleabihf.rs | 11 +
.../rustc_target/src/spec/i686_gentoo_linux_musl.rs | 11 +++++++++++ .../src/spec/i686_gentoo_linux_musl.rs | 11 +
compiler/rustc_target/src/spec/mod.rs | 8 ++++++++ compiler/rustc_target/src/spec/mod.rs | 8 +
.../src/spec/powerpc64_gentoo_linux_musl.rs | 11 +++++++++++ compiler/rustc_target/src/spec/mod.rs.orig | 2465 +++++++++++++++++
.../src/spec/powerpc64le_gentoo_linux_musl.rs | 11 +++++++++++ .../src/spec/powerpc64_gentoo_linux_musl.rs | 11 +
.../src/spec/powerpc_gentoo_linux_musl.rs | 11 +++++++++++ .../src/spec/powerpc64le_gentoo_linux_musl.rs | 11 +
.../rustc_target/src/spec/x86_64_gentoo_linux_musl.rs | 11 +++++++++++ .../src/spec/powerpc_gentoo_linux_musl.rs | 11 +
8 files changed, 85 insertions(+) .../src/spec/x86_64_gentoo_linux_musl.rs | 11 +
9 files changed, 2550 insertions(+)
create mode 100644 compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs create mode 100644 compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs
create mode 100644 compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs create mode 100644 compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs
create mode 100644 compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs create mode 100644 compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs
create mode 100644 compiler/rustc_target/src/spec/mod.rs.orig
create mode 100644 compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs create mode 100644 compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs
create mode 100644 compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs create mode 100644 compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs
create mode 100644 compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs create mode 100644 compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs
@ -23,7 +25,7 @@ Subject: [PATCH] add gentoo musl target specs
diff --git a/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs
new file mode 100644 new file mode 100644
index 0000000..420fe7c index 0000000..ca5f28f
--- /dev/null --- /dev/null
+++ b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs +++ b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@ -32,15 +34,15 @@ index 0000000..420fe7c
+pub fn target() -> Target { +pub fn target() -> Target {
+ let mut base = super::aarch64_unknown_linux_musl::target(); + let mut base = super::aarch64_unknown_linux_musl::target();
+ +
+ base.llvm_target = "aarch64-gentoo-linux-musl".to_string(); + base.llvm_target = "aarch64-gentoo-linux-musl".into();
+ base.options.vendor = "gentoo".to_string(); + base.options.vendor = "gentoo".into();
+ base.options.crt_static_default = false; + base.options.crt_static_default = false;
+ +
+ base + base
+} +}
diff --git a/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs diff --git a/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs
new file mode 100644 new file mode 100644
index 0000000..067e2d6 index 0000000..24b3b30
--- /dev/null --- /dev/null
+++ b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs +++ b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@ -49,15 +51,15 @@ index 0000000..067e2d6
+pub fn target() -> Target { +pub fn target() -> Target {
+ let mut base = super::armv7_unknown_linux_musleabihf::target(); + let mut base = super::armv7_unknown_linux_musleabihf::target();
+ +
+ base.llvm_target = "armv7-gentoo-linux-musleabihf".to_string(); + base.llvm_target = "armv7-gentoo-linux-musleabihf".into();
+ base.options.vendor = "gentoo".to_string(); + base.options.vendor = "gentoo".into();
+ base.options.crt_static_default = false; + base.options.crt_static_default = false;
+ +
+ base + base
+} +}
diff --git a/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs
new file mode 100644 new file mode 100644
index 0000000..1cd39cd index 0000000..cab0923
--- /dev/null --- /dev/null
+++ b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs +++ b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@ -66,17 +68,17 @@ index 0000000..1cd39cd
+pub fn target() -> Target { +pub fn target() -> Target {
+ let mut base = super::i686_unknown_linux_musl::target(); + let mut base = super::i686_unknown_linux_musl::target();
+ +
+ base.llvm_target = "i686-gentoo-linux-musl".to_string(); + base.llvm_target = "i686-gentoo-linux-musl".into();
+ base.options.vendor = "gentoo".to_string(); + base.options.vendor = "gentoo".into();
+ base.options.crt_static_default = false; + base.options.crt_static_default = false;
+ +
+ base + base
+} +}
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index f1e8330..d8c0ba0 100644 index bd5b712..34b923b 100644
--- a/compiler/rustc_target/src/spec/mod.rs --- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs
@@ -490,6 +490,14 @@ macro_rules! supported_targets { @@ -808,6 +808,14 @@ macro_rules! supported_targets {
} }
supported_targets! { supported_targets! {
@ -93,7 +95,7 @@ index f1e8330..d8c0ba0 100644
("i686-unknown-linux-gnu", i686_unknown_linux_gnu), ("i686-unknown-linux-gnu", i686_unknown_linux_gnu),
diff --git a/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs
new file mode 100644 new file mode 100644
index 0000000..e840bb2 index 0000000..b188a7c
--- /dev/null --- /dev/null
+++ b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs +++ b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@ -102,15 +104,15 @@ index 0000000..e840bb2
+pub fn target() -> Target { +pub fn target() -> Target {
+ let mut base = super::powerpc64_unknown_linux_musl::target(); + let mut base = super::powerpc64_unknown_linux_musl::target();
+ +
+ base.llvm_target = "powerpc64-gentoo-linux-musl".to_string(); + base.llvm_target = "powerpc64-gentoo-linux-musl".into();
+ base.options.vendor = "gentoo".to_string(); + base.options.vendor = "gentoo".into();
+ base.options.crt_static_default = false; + base.options.crt_static_default = false;
+ +
+ base + base
+} +}
diff --git a/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs
new file mode 100644 new file mode 100644
index 0000000..1037d82 index 0000000..395f603
--- /dev/null --- /dev/null
+++ b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs +++ b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@ -119,15 +121,15 @@ index 0000000..1037d82
+pub fn target() -> Target { +pub fn target() -> Target {
+ let mut base = super::powerpc64le_unknown_linux_musl::target(); + let mut base = super::powerpc64le_unknown_linux_musl::target();
+ +
+ base.llvm_target = "powerpc64le-gentoo-linux-musl".to_string(); + base.llvm_target = "powerpc64le-gentoo-linux-musl".into();
+ base.options.vendor = "gentoo".to_string(); + base.options.vendor = "gentoo".into();
+ base.options.crt_static_default = false; + base.options.crt_static_default = false;
+ +
+ base + base
+} +}
diff --git a/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs
new file mode 100644 new file mode 100644
index 0000000..a623ffe index 0000000..cb3121d
--- /dev/null --- /dev/null
+++ b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs +++ b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@ -136,15 +138,15 @@ index 0000000..a623ffe
+pub fn target() -> Target { +pub fn target() -> Target {
+ let mut base = super::powerpc_unknown_linux_musl::target(); + let mut base = super::powerpc_unknown_linux_musl::target();
+ +
+ base.llvm_target = "powerpc-gentoo-linux-musl".to_string(); + base.llvm_target = "powerpc-gentoo-linux-musl".into();
+ base.options.vendor = "gentoo".to_string(); + base.options.vendor = "gentoo".into();
+ base.options.crt_static_default = false; + base.options.crt_static_default = false;
+ +
+ base + base
+} +}
diff --git a/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs diff --git a/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs
new file mode 100644 new file mode 100644
index 0000000..f330473 index 0000000..2fcdb66
--- /dev/null --- /dev/null
+++ b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs +++ b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@ -153,12 +155,12 @@ index 0000000..f330473
+pub fn target() -> Target { +pub fn target() -> Target {
+ let mut base = super::x86_64_unknown_linux_musl::target(); + let mut base = super::x86_64_unknown_linux_musl::target();
+ +
+ base.llvm_target = "x86_64-gentoo-linux-musl".to_string(); + base.llvm_target = "x86_64-gentoo-linux-musl".into();
+ base.options.vendor = "gentoo".to_string(); + base.options.vendor = "gentoo".into();
+ base.options.crt_static_default = false; + base.options.crt_static_default = false;
+ +
+ base + base
+} +}
-- --
2.29.2 2.35.1

2
sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.61.0.ebuild vendored
View File

@ -153,7 +153,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
PATCHES=( PATCHES=(
"${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch "${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch
"${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch "${FILESDIR}"/1.61.0-gentoo-musl-target-specs.patch
) )
S="${WORKDIR}/${MY_P}-src" S="${WORKDIR}/${MY_P}-src"