Skip to content

Commit

Permalink
dev-lang/rust: Version bump to 1.38.0
Browse files Browse the repository at this point in the history
Signed-off-by: Samuel Holland <samuel@sholland.org>
  • Loading branch information
smaeul committed Oct 13, 2019
1 parent 72bb20d commit 1e33dc5
Show file tree
Hide file tree
Showing 30 changed files with 416 additions and 309 deletions.
14 changes: 7 additions & 7 deletions dev-lang/rust/Manifest
@@ -1,7 +1,7 @@
DIST rust-1.36.0-aarch64-gentoo-linux-musl.tar.xz 128496416 BLAKE2B ad92cd5225164279e6500d85d7273a889a145b3272cf857a4eb3e5eb38c640bf9b8ccab3006d87c5fd594988f0b041090e98926bd9b43bd0a9561ba05aa95a2b SHA512 11352d04cca8ba3b14c4563e42122a1693f9d1d260b9a354b7b82d29bf5e6fccb76d19ff182fa78840c1a4a30c98cc528248dfa7f7dff6fe9a7811c8db136b98
DIST rust-1.36.0-armv7a-unknown-linux-musleabihf.tar.xz 127165328 BLAKE2B aa6bb792a8ec6a07b10a462a8731c244442c4cc1140e0c4d847dcec20ba9e36af2ce2631935ffcbb31a2b6d25921646d1104c2a784fde06903524f12ed715ea8 SHA512 09de9802823d49da7d20abf0cdb4bd514128151b79fe4b9404e588bd4e7e30095a43a58f2e382c8266be936346d14bf2123ce123dab682b882353eba74184208
DIST rust-1.36.0-i686-gentoo-linux-musl.tar.xz 138138860 BLAKE2B 6d9187380e4dfc339ffb9d55821e7e37d10a9e161519768dcfb18a99d54473248f18f41bb5a82e2085ce82214b977208bedd455d35489ba9c1825bb5ba2476f7 SHA512 a0646ea720b9066e74b92a94e286b8ab2e86d95033182f86e34f37f005a4522230017823a9b0bf3598cd25d31b4d7b4879a2c0af9c79fa0315c13fd3484840db
DIST rust-1.36.0-powerpc-gentoo-linux-musl.tar.xz 135141336 BLAKE2B a20979e2f8f7d31ec7957fff66934aaa26cd5add2091145c76ee486153a0d29d7f7739f0a7a3e5b18f101bf22dcb44034906320fe5ed1338632c6129c5adeb11 SHA512 8190df183a8ecc5ca0c523e9eda5b5db500a513604af38a4ff5b279bf8ff9578e037096bdd904b44cf79152c32ab0131fc16db35a475b3c610b7f4ffff2d9165
DIST rust-1.36.0-powerpc64-gentoo-linux-musl.tar.xz 118413340 BLAKE2B 2dd251ec016e3474a8bdd801ea47207aeba66557d3b296384b68d10260246aa4807bf59eb2fc0aef27fa729fc81ec6af6bdccb0cb7b2832ac83095408816b2bb SHA512 3f40f8e8cd8eed8d3086706a32f37fd5e66e36936e7424016076e715a3599bafe966897f25785b94f22158629bd6c1c0581a17bc2aa275d00c88e336b1ec6169
DIST rust-1.36.0-x86_64-gentoo-linux-musl.tar.xz 139310056 BLAKE2B 827e3bdc392270412de19e61775982dfba74b97b86660d282d2724982b07bbd2465772a736d5087bedc1324d1d8d45d8ee33fcdaf4c2db1c11fe5d8c6a82d1fb SHA512 92251f97e4c9a8d215dd5e7a3b5a912043ac1d171244957a1128e748aaf11c37f74c4f83de4b52012073580e1424f9b2cf105b9ca50397b41b5d72bc2609f87e
DIST rustc-1.37.0-src.tar.xz 98654252 BLAKE2B ddee92c7959a0e1ee11ffe5ded6017703cfac7bbf2a00dc46c37ed28f1cd1d31e1d5b62cc1a5ae2d55d64f8705d0cb282f4968deddf36c3152e5e0cfdfbea67d SHA512 bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4
DIST rust-1.37.0-aarch64-gentoo-linux-musl.tar.xz 120357256 BLAKE2B ddac3cd6d3bea9bf10aecc821fa726cc7eb968e45ad71652ffb1b84e50ba65430a93867ac0d99c941fc03bcd081e74aa5d3e2bcfbb3930da3b4dfe28400e2706 SHA512 0bc2ab94a95b23bfaafc90e92917ac2d6c87e6b06ded050e6ef4f35de26d271dd106f51437e98d0e95d03c4a7155bfcb0cf459dd8aa65672daf8e478184eae83
DIST rust-1.37.0-armv7a-unknown-linux-musleabihf.tar.xz 118986736 BLAKE2B 2e31c88943c49ef6cd45a3e836f375b2c4f4140b47ae3b3f671b9ac34d57538b898c7cf3900c7aeee6784a144cc3c14732bce8c3fcc033b47f1a484e0f980ac0 SHA512 e95e2601d3f3cd94eefea8ae4b88e85392731d2133939e94eb81d201d6ae4fb868651b0af3cea384122434090a0a21bca69524f09dafcd2c778d181a40dd08c6
DIST rust-1.37.0-i686-gentoo-linux-musl.tar.xz 132558604 BLAKE2B 50b02fe1e6cf3276711b7d726cc2cf359d5f4123795b3323087adb1d23dd6da172ec5a8d124067edb95db9864e672f9ac6f845919c70791cb6760a9d472fb967 SHA512 fbd5ae8297258ec7f8b91e7afdee1b90962e24a03ef3bbfc0a694e8f4a1fb45e3eb869c61f239b3cdac20342570aae21d1aa87607a151f6fb1a510fecce5ea45
DIST rust-1.37.0-powerpc-gentoo-linux-musl.tar.xz 124629164 BLAKE2B 802f89c8215243bc6555f4eee1f24a53b7a5716c1807b10455a5093c57869ab810de3ba49022b592e5771ecb37b79c6e6ca9ceeabaa92a2d1fd953bc7189f4f5 SHA512 7d79d5ebe76ddb71f6b902619beb3f4f1adb05e2c44eea6a6de487acfe1adf47851b47140bc36bf3200ddc7c8e2c08f9f4108a754bd5fb062f4942b8569f4177
DIST rust-1.37.0-powerpc64-gentoo-linux-musl.tar.xz 108844008 BLAKE2B 158c856418ecc58842e26390dd0a4e39f48179565f44ffca60c99842265dcd86ae4d3539146842e0fce1487c4a45c32c761afc4b56b61c3b082dc1a680ea27ce SHA512 63f03cd630908f34da1331746b641af6ccdf8599e7288306c3a12b191309363856d1a6ae4c50596e830a2d2e0d6968efe1f44c93315638bf6ef070fc1aca86f7
DIST rust-1.37.0-x86_64-gentoo-linux-musl.tar.xz 129991444 BLAKE2B e135a4325be4536cefdac0aef3e3f7b43de012a670f0aec9c11a8ff76206487917806b95bcf0d536629f8ec774d241d494c2f6760bcc4918ed6127066ec75ab9 SHA512 a5ac56105eea8509a77d6238f851fa13d3d40200bc20115cdaf5d4a9501582b3f785967a02b6cbf6f95ead3e7cd879b2cd76ca9f0f29c60f8d169e2f25cf6876
DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec209bbeb349816b5f7937e58c165db8befae33c5667732e5aaaa677c5a6c1e0229d9969ab8967fda9b8d7a593e6c5eb6 SHA512 b756d29a7a222bc7b5c7f42ff397346ab840f78e559f93e6e36b65e76eea525cf429899fe4de9fb8966623a2225b552feef9fa831bee50f9e25c976fa2af8c0a
@@ -1,17 +1,17 @@
From c5fd39c8da01cdb0fea0e323937abcf4895b7511 Mon Sep 17 00:00:00 2001
From ffe35880050c7e38bb50cb9ecb7b325bb9eff6d9 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Wed, 10 Jan 2018 13:36:41 -0600
Subject: [PATCH 01/16] Don't pass CFLAGS to the C++ compiler
Subject: [PATCH 01/18] 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 2e9df48d000..f5ced5b16ed 100644
index e54c9360bae..7bdd73aa381 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1138,8 +1138,7 @@ impl<'a> Builder<'a> {
@@ -1126,8 +1126,7 @@ impl<'a> Builder<'a> {
if let Ok(cxx) = self.cxx(target) {
let cxx = ccacheify(&cxx);
cargo
Expand Down
8 changes: 4 additions & 4 deletions dev-lang/rust/files/0002-Fix-LLVM-build.patch
@@ -1,17 +1,17 @@
From 0a19456e2445def4cfe99dd02cf8292c1db5d4d4 Mon Sep 17 00:00:00 2001
From 02bae9a59de4e38001272219b8a9909549c12df8 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Fri, 8 Sep 2017 00:04:29 -0500
Subject: [PATCH 02/16] Fix LLVM build
Subject: [PATCH 02/18] 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 4d297fa918a..867df81d972 100644
index b72aa78f3de..3374c88550a 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -769,7 +769,8 @@ impl Build {
@@ -768,7 +768,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())
Expand Down
@@ -1,18 +1,18 @@
From 2200debf48b6ef4c87e258cf8a968a89903f8723 Mon Sep 17 00:00:00 2001
From 9cf754ab1d6ad14f0c95b3c18c4997ee655e62ed Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 2 Dec 2017 17:25:44 -0600
Subject: [PATCH 03/16] Allow rustdoc to work when cross-compiling on musl
Subject: [PATCH 03/18] 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 1c9f6e1ab28..7e90be8d8cc 100644
index ff38ee8788f..184c9b16562 100644
--- a/src/bootstrap/bin/rustdoc.rs
+++ b/src/bootstrap/bin/rustdoc.rs
@@ -23,9 +23,6 @@ fn main() {
@@ -24,9 +24,6 @@ fn main() {
Err(_) => 0,
};

Expand All @@ -22,7 +22,7 @@ index 1c9f6e1ab28..7e90be8d8cc 100644
//FIXME(misdreavus): once stdsimd uses cfg(rustdoc) instead of cfg(dox), remove the `--cfg dox`
//arguments here
let mut cmd = Command::new(rustdoc);
@@ -37,7 +34,7 @@ fn main() {
@@ -38,7 +35,7 @@ fn main() {
.arg("--sysroot")
.arg(&sysroot)
.env(bootstrap::util::dylib_path_var(),
Expand All @@ -31,7 +31,7 @@ index 1c9f6e1ab28..7e90be8d8cc 100644

// Force all crates compiled by this compiler to (a) be unstable and (b)
// allow the `rustc_private` feature to link to other unstable crates
@@ -86,7 +83,7 @@ fn main() {
@@ -87,7 +84,7 @@ fn main() {
eprintln!(
"rustdoc command: {:?}={:?} {:?}",
bootstrap::util::dylib_path_var(),
Expand Down
@@ -1,7 +1,7 @@
From 10bd267ac2621267e1f537a5a7df34cb87354cd3 Mon Sep 17 00:00:00 2001
From 8f2821b37da4fe2710e1bf7944765a5c2cf8d98c Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Fri, 8 Sep 2017 00:05:18 -0500
Subject: [PATCH 04/16] Require static native libraries when linking static
Subject: [PATCH 04/18] Require static native libraries when linking static
executables

On ELF targets like Linux, gcc/ld will create a dynamically-linked
Expand All @@ -16,10 +16,10 @@ Fixes #54243
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 e3d297e7862..974e8c0239b 100644
index 8fb0828285c..2d8a0b86076 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -1571,9 +1571,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
@@ -1567,9 +1567,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(cmd: &mut dyn Linker,
}
}

Expand All @@ -30,7 +30,7 @@ index e3d297e7862..974e8c0239b 100644
//
// 1. The upstream crate is an rlib. In this case we *must* link in the
// native dependency because the rlib is just an archive.
@@ -1616,7 +1614,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
@@ -1612,7 +1610,19 @@ pub fn add_upstream_native_libraries(cmd: &mut dyn Linker,
continue
}
match lib.kind {
Expand Down

0 comments on commit 1e33dc5

Please sign in to comment.