dev-lang/rust: reimport rust-1.39.0 from smauel overlay

Signed-off-by: Steffen Kuhn <[email protected]>

Author: stefson

dev-lang/rust/Manifest

@@ -4,4 +4,11 @@ DIST rust-1.33.0-i686-gentoo-linux-musl.tar.xz 116133752 BLAKE2B a9cf13caa12da6a
 DIST rust-1.33.0-powerpc-gentoo-linux-musl.tar.xz 104602692 BLAKE2B bef7cacfd7d9e411f18f6b64403c3bdc33bb17270f966aa9cb6ff99e80d8da9bd1346e8c3e3081df7bee3f367d3940b3badd6aeec6859f4a3de75cfeb108de1a SHA512 2314b5d31c9cc31b28a3668ebd4e1a88a4f090c60b141c8e3e4fb06b4c311ef64ab9217acbdb34417e1f3aaf74fda2087ba90ad70075b7197471bf8bfc804370
 DIST rust-1.33.0-powerpc64-gentoo-linux-musl.tar.xz 98455708 BLAKE2B fde1ca61ddcfe1091aa2c39ffb9ea47ef4ef2b63557059eeda4df6c90bcf30b22bf09e0bd301d7993d27d18e0c5dbc84db123613a8ac31c68abcb56d1b3892bc SHA512 9dbe37abd4edd519ac3596d405b9af7a4a3de1da56161bed66f9f2f40d505beaa9d7c998c6775d6c86d4e086e5cb085f65702b6be7a182663c1e0c6b2095a242
 DIST rust-1.33.0-x86_64-gentoo-linux-musl.tar.xz 113838416 BLAKE2B 2d118520a118746ca16aac7b336e03805c3a02df20b2abdd2e9f6a4fcc062c17b0d057347447027287f8fdceeaa34a171835e6f22d45098097b540c97cee23a1 SHA512 cd2a6277af99cfaf84f5d293a09e0af9189e1d9148bc4031dd32620f0eb086695e175c6a04e6cceb673af976566114e4a75d42654505d295135a8fc95eb2f850
+DIST rust-1.38.0-aarch64-gentoo-linux-musl.tar.xz 197994668 BLAKE2B 4029c97c7c1202c539919f73318db3faa350f4a99f7ea53ba6052249f783a845c7fb4c1722ef901a504111d1a63b794b909147d281864e91f0d7dc23b3748ff2 SHA512 1e7fd09dd52cb5e1e0c9f7f65d90d80a20860ed0186259cb996fe21a742e57c3af471e77384c870d9a5c5c85a042cbdf4418681773445cea7b7db73267c597e0
+DIST rust-1.38.0-armv7a-unknown-linux-musleabihf.tar.xz 198006500 BLAKE2B 0a99c5e41949da067524cd030297bdcaae829b916d2f47c6962b811a73c29958e14cf0b00d5f0f16a5201335ecd13ac554299ce91f7e3b1987a05a6966c88adc SHA512 afa16200fd11e427fd7056d58b00be13ffb384b1b9cf8fb8fa38fdaee889d88aaa58f4429ed29ee4326581ddb24e09f8a9af3abd2247019ebe942ed96e3820b1
+DIST rust-1.38.0-i686-gentoo-linux-musl.tar.xz 208659212 BLAKE2B 2a233ab2566a256ebf5a535276c8212f3746c1ecfe9e1579fab7e46e09d243137ef2d6fa2b24fc90312b3825e355b2d9f92b33c10ea1c6ebd1bc3405285f2a1a SHA512 4de4a808c5f3109f9651c2b11ccef9d65e3bb1c6f6a4e221b1a4679ef571c0b94fb4fcb2943de2d483db939573cabe05c7a7cde4ebb379060010bcf1d4eb1e6c
+DIST rust-1.38.0-powerpc-gentoo-linux-musl.tar.xz 202029564 BLAKE2B ee732fd714d6d1d554fffbb0c560e1b8fa5d5a4acf6d7ccaa2665ce02b273740f477395a8ca93225bcaec6a71b0f5d5fe302975d038ba248b93f242a05f8133a SHA512 c997c24ca9ae780b51125d13476ef2b2a996a67a24f647f8ccff65543674a29d351835fafd818b80f7bc8f3def4d5a1bf499bef47ba6c91d156df2336a411bfe
+DIST rust-1.38.0-powerpc64-gentoo-linux-musl.tar.xz 182117568 BLAKE2B d3d84572efe21adc3739eac13b8084fce293d417b383de9037d6e78aba9de1fbff9cb6636e0992179eb74c5ed708d39b1aad18d2b3ab4915c8768939fc25eed4 SHA512 4b9d7b143cc3c5114476c1369e0de22f42f4b312331ad6fe1f18d8edba8e5b9ac67284748c1b20ce935be5f7b4741552aa1f7070cec70bffee639f591182e090
+DIST rust-1.38.0-x86_64-gentoo-linux-musl.tar.xz 205761400 BLAKE2B 2c62d7564c56e6c356dd5a8253658efce455d23c2d6d5ee1e4327f77bea654250ac276afa2da91a0d6ed919787d215280c2f79fb6577a4ed2d838e756411f512 SHA512 c62618f9b748221f99b2a26d0001729a0c6093d3bbd31d7a156a1087a0e324873891f8c1cc40e56dc333bd6fee7e229c5143f0e7bd750d768e31545c05060645
 DIST rustc-1.34.2-src.tar.xz 95048792 BLAKE2B e81e4bfda87ddfb09ab8a74792346970aa440c678d2bb1279c329db4929282f761ada6fea9d81ceeecfd513613025c8e636487626fc36bd0b33559e045bb1b15 SHA512 f1bd2b226d90aae8a4657e6117b9a8451d4ce8129f79cc0fce0da7613a3b7800e690bc0ede8fec20a2f5f32c13fa8e22ac97d3838e0d36936793535a75d9c381
+DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0

dev-lang/rust/files/rust-1.39.0/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch

@@ -0,0 +1,26 @@
+From 799529380ffbd6ffb51afd09cbcebba99a28f7ee Mon Sep 17 00:00:00 2001
+From: Samuel Holland <[email protected]>
+Date: Wed, 10 Jan 2018 13:36:41 -0600
+Subject: [PATCH 01/19] Don't pass CFLAGS to the C++ compiler
+
+---
+ src/bootstrap/builder.rs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index 5d586f0c461..6b1b1e62a2c 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -1129,8 +1129,7 @@ impl<'a> Builder<'a> {
+             if let Ok(cxx) = self.cxx(target) {
+                 let cxx = ccacheify(&cxx);
+                 cargo
+-                    .env(format!("CXX_{}", target), &cxx)
+-                    .env(format!("CXXFLAGS_{}", target), cflags);
++                    .env(format!("CXX_{}", target), &cxx);
+             }
+         }
+ 
+-- 
+2.23.0
+

dev-lang/rust/files/rust-1.39.0/0002-Fix-LLVM-build.patch

@@ -0,0 +1,26 @@
+From c39f4eb79c5320ef322919d76e27648c5680b610 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <[email protected]>
+Date: Fri, 8 Sep 2017 00:04:29 -0500
+Subject: [PATCH 02/19] Fix LLVM build
+
+---
+ src/bootstrap/lib.rs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
+index 9203a558f64..d292609f57c 100644
+--- a/src/bootstrap/lib.rs
++++ b/src/bootstrap/lib.rs
+@@ -757,7 +757,8 @@ impl Build {
+         // cc-rs because the build scripts will determine that for themselves.
+         let mut base = self.cc[&target].args().iter()
+                            .map(|s| s.to_string_lossy().into_owned())
+-                           .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
++                           .filter(|s| !s.starts_with("-O") && !s.starts_with("/O")
++                                   && !s.starts_with("-static"))
+                            .collect::<Vec<String>>();
+ 
+         // If we're compiling on macOS then we add a few unconditional flags
+-- 
+2.23.0
+

dev-lang/rust/files/rust-1.39.0/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch

@@ -0,0 +1,45 @@
+From e9000315746f99444ad125e75b07ae1b1840c398 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <[email protected]>
+Date: Sat, 2 Dec 2017 17:25:44 -0600
+Subject: [PATCH 03/19] Allow rustdoc to work when cross-compiling on musl
+
+musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
+---
+ src/bootstrap/bin/rustdoc.rs | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
+index a13ff69a7b5..471b60f55a7 100644
+--- a/src/bootstrap/bin/rustdoc.rs
++++ b/src/bootstrap/bin/rustdoc.rs
+@@ -22,9 +22,6 @@ fn main() {
+         Err(_) => 0,
+     };
+ 
+-    let mut dylib_path = bootstrap::util::dylib_path();
+-    dylib_path.insert(0, PathBuf::from(libdir.clone()));
+-
+     //FIXME(misdreavus): once stdsimd uses cfg(rustdoc) instead of cfg(dox), remove the `--cfg dox`
+     //arguments here
+     let mut cmd = Command::new(rustdoc);
+@@ -36,7 +33,7 @@ fn main() {
+         .arg("--sysroot")
+         .arg(&sysroot)
+         .env(bootstrap::util::dylib_path_var(),
+-             env::join_paths(&dylib_path).unwrap());
++             PathBuf::from(libdir.clone()));
+ 
+     // Force all crates compiled by this compiler to (a) be unstable and (b)
+     // allow the `rustc_private` feature to link to other unstable crates
+@@ -87,7 +84,7 @@ fn main() {
+         eprintln!(
+             "rustdoc command: {:?}={:?} {:?}",
+             bootstrap::util::dylib_path_var(),
+-            env::join_paths(&dylib_path).unwrap(),
++            PathBuf::from(libdir.clone()),
+             cmd,
+         );
+         eprintln!("sysroot: {:?}", sysroot);
+-- 
+2.23.0
+

dev-lang/rust/files/rust-1.39.0/0004-Require-static-native-libraries-when-linking-static-.patch

@@ -0,0 +1,56 @@
+From c218d539346be8589fc99a0ff5aee6f6ce7eee2f Mon Sep 17 00:00:00 2001
+From: Samuel Holland <[email protected]>
+Date: Fri, 8 Sep 2017 00:05:18 -0500
+Subject: [PATCH 04/19] Require static native libraries when linking static
+ executables
+
+On ELF targets like Linux, gcc/ld will create a dynamically-linked
+executable without warning, even when passed `-static`, when asked to
+link to a `.so`. Avoid this confusing and unintended behavior by always
+using the static version of libraries when trying to link static
+executables.
+
+Fixes #54243
+---
+ src/librustc_codegen_ssa/back/link.rs | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
+index 9b044d9b453..e225301378b 100644
+--- a/src/librustc_codegen_ssa/back/link.rs
++++ b/src/librustc_codegen_ssa/back/link.rs
+@@ -1602,9 +1602,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
+     }
+ }
+ 
+-// Link in all of our upstream crates' native dependencies. Remember that
+-// all of these upstream native dependencies are all non-static
+-// dependencies. We've got two cases then:
++// Link in all of our upstream crates' native dependencies. We have two cases:
+ //
+ // 1. The upstream crate is an rlib. In this case we *must* link in the
+ // native dependency because the rlib is just an archive.
+@@ -1647,7 +1645,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
+                 continue
+             }
+             match lib.kind {
+-                NativeLibraryKind::NativeUnknown => cmd.link_dylib(name),
++                NativeLibraryKind::NativeUnknown => {
++                    // On some targets, like Linux, linking a static executable inhibits using
++                    // dylibs at all. Force native libraries to be static, even if for example
++                    // an upstream rlib was originally linked against a native shared library.
++                    if crate_type == config::CrateType::Executable
++                        && sess.crt_static()
++                        && !sess.target.target.options.crt_static_allows_dylibs
++                    {
++                        cmd.link_staticlib(name)
++                    } else {
++                        cmd.link_dylib(name)
++                    }
++                },
+                 NativeLibraryKind::NativeFramework => cmd.link_framework(name),
+                 NativeLibraryKind::NativeStaticNobundle => {
+                     // Link "static-nobundle" native libs only if the crate they originate from
+-- 
+2.23.0
+