Skip to contentSkip to conversation

Bump rust to 1.33.0

PATCH New Eric Le Bihan 2 participants 5 messages Apr 6, 2019 – Apr 11, 2019

lore
Share & tools
lore
#0 lore raw

cover Bump rust to 1.33.0

This tiny series bumps rust and rust-bin to 1.33.0 as well as cargo-bin to 0.33.

The cargo package is not bumped, as the source code is now included in the rust tarball and should be built from it. An impedending patch series will convert cargo to a virtual package and set cargo-bin and rust as providers.

Eric Le Bihan (3):
cargo-bin: bump version to 0.33.0
rust-bin: bump version to 1.33.0
rust: bump version to 1.33.0

 package/cargo-bin/cargo-bin.hash              |  18 +-
 package/cargo-bin/cargo-bin.mk                |   2 +-
 package/rust-bin/rust-bin.hash                |  75 +++--
 package/rust-bin/rust-bin.mk                  |   7 +-
 ...esence-of-LLVM-library-in-stage0-lib.patch | 264 ++++++++++++++++++
 package/rust/rust.hash                        |   5 +-
 package/rust/rust.mk                          |  12 +-
 7 files changed, 328 insertions(+), 55 deletions(-)
 create mode 100644 package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch

--
2.17.2

#1 lore raw

PATCH 1/3 cargo-bin: bump version to 0.33.0

---
 package/cargo-bin/cargo-bin.hash | 18 +++++++++---------
 package/cargo-bin/cargo-bin.mk   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
package/cargo-bin/cargo-bin.hash +9 -9
index 2673e157af..0e9e9c5c61 100644
@@ -1,12 +1,12 @@
-# From https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/cargo-0.30.0-i686-unknown-linux-gnu.tar.xz.asc
-sha256 43a5754d13fa0436b33c48b1f562b4198d6930efad3dc36284b88289ff20d74d  cargo-0.30.0-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz.asc
-sha256 f8d7c27a40bba6343ee7dd39a324fe772b77824921adf3e9514a44d4e49059c8  cargo-0.30.0-powerpc64le-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz.asc
-sha256 cb7c63c166baa42ab0be08429e29fa59fc7108efd17ca512462b2645b1655a7f  cargo-0.30.0-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.asc
+sha256 13acdb3c9f2505805ceed8a696f5f62ab8cd73e443cd43d6edd588aad88e1c32  cargo-0.33.0-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc
+sha256 6628db22370f397676195555d768f0449a60f0a694bcac24611f4cd1cfc97cdc  cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.asc
+sha256 c2c31db68c4dcb50ad856a19e6f11489a0d4df1212f31bd068dfbb73c5425761  cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz
 # Locally generated
 sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2  LICENSE-APACHE
 sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
package/cargo-bin/cargo-bin.mk +1 -1
index 7fb4508a52..3614f7a53d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CARGO_BIN_VERSION = 0.30.0
+CARGO_BIN_VERSION = 0.33.0
 CARGO_BIN_SITE = https://static.rust-lang.org/dist
 CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz
 CARGO_BIN_LICENSE = Apache-2.0 or MIT
Signature · 1 line
2.17.2
#2 lore raw

PATCH 1/3 cargo-bin: bump version to 0.33.0

Hello Eric,

Quoted 5 lines · On Sat, 6 Apr 2019 16:42:09 +0200 Eric Le Bihan <[email protected]>…
---
 package/cargo-bin/cargo-bin.hash | 18 +++++++++---------
 package/cargo-bin/cargo-bin.mk   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

Series applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/3 rust-bin: bump version to 1.33.0

In reply to Eric Le Bihan
---
 package/rust-bin/rust-bin.hash | 75 ++++++++++++++++++++--------------
 package/rust-bin/rust-bin.mk   |  7 ++--
 2 files changed, 49 insertions(+), 33 deletions(-)
package/rust-bin/rust-bin.hash +45 -30
index 36f959f257..96d81a347c 100644
@@ -1,33 +1,48 @@
-# From https://static.rust-lang.org/dist/rustc-1.29.2-i686-unknown-linux-gnu.tar.xz.sha256
-sha256 d251b3ade6a66856ff62ea86ed8d34f8cc2a9cd683bf42c3b0c0345f0d955b7c  rustc-1.29.2-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rustc-1.29.2-x86_64-unknown-linux-gnu.tar.xz.sha256
-sha256 b0ea41cd20caf9af62394601b09d2c8b12814293f3cc1247a8c61fb672477499  rustc-1.29.2-x86_64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-aarch64-unknown-linux-gnu.tar.xz.sha256
-sha256 df62bdb6839e313f8f9c3a92b4de63ba2c37b9c7b534449a392db1ede0f6a741  rust-std-1.29.2-aarch64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-arm-unknown-linux-gnueabi.tar.xz.sha256
-sha256 7729765dab2945c688d0f10faf313c14aed22f6cfdc96a0a07292292662f260a  rust-std-1.29.2-arm-unknown-linux-gnueabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-arm-unknown-linux-gnueabihf.tar.xz.sha256
-sha256 5e4f02edccd013b19b6d03c2a28bff4f81b9cdf7475882e1480aeb21378f93cf  rust-std-1.29.2-arm-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz.sha256
-sha256 d7e6ba57e790fc4e5d02c0b4b0471178b05341cf932bfc349b90ced9b939209e  rust-std-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-i686-unknown-linux-gnu.tar.xz.sha256
-sha256 4e8c54a54b3060cde9e24d0c32585360098cc75a120543429ccf498d8b83b5d0  rust-std-1.29.2-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips-unknown-linux-gnu.tar.xz.sha256
-sha256 556596ac7e2dc462573e8379fd1596dc59394044b3a11f0c50f54642439cf8ab  rust-std-1.29.2-mips-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz.sha256
-sha256 8dac2dfc4db7932e6214e98494824453a7be8bb42cf29d5395cc2363fc2fb0c2  rust-std-1.29.2-mips64-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
-sha256 361d70abfc27b7fdbe8642bc7413f9b55463e90350465de96183ff048fcf149f  rust-std-1.29.2-mips64el-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-mipsel-unknown-linux-gnu.tar.xz.sha256
-sha256 8005463e56932bdf272a047281cc20087db68d8fef4cbcf8cf4edf9a2260f8cc  rust-std-1.29.2-mipsel-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc-unknown-linux-gnu.tar.xz.sha256
-sha256 6cda45f5ee39dbfef95d516a1e0e25744b11d1a8147188b71c21f85f65bca9a9  rust-std-1.29.2-powerpc-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc64-unknown-linux-gnu.tar.xz.sha256
-sha256 612f175c895a495e401205025805a9e8dffa53b2f105a55f92894b159a87fe28  rust-std-1.29.2-powerpc64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz.sha256
-sha256 16034975bd09b57eb1579b659010f83b869733c9c018c2a189a385fa77923875  rust-std-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.xz.sha256
-sha256 be16e9db4e39e5e1af0621eea715d13e0fdc56f7b14c3d7310905dc34dfa618a  rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.asc
+sha256 90b6414eddbce4a245cdcaea8353d3a637ef565d2bd119e25a6c2bf3e38cdf63  rustc-1.33.0-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc
+sha256 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1  rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.asc
+sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505  rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.asc
+sha256 ddb372a43fb2ba9949e78643df43d6ae447b70cefd440ccdd6b9f6c2ff929ea7  rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.asc
+sha256 1142d5064d8cbfab16ab71130e5a84804a1ebdfeb10173e6238adc0d757937b6  rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.asc
+sha256 8492b5c91a9ea7ee7e22881382c1b9ad8bb9a4147aff0dfee09940b34783e3d5  rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.asc
+sha256 e945dd37ab9b143dbcbcdbeaba63b8de47411a4ff815d2e178f745e183078127  rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.asc
+sha256 abf6b7050c1cdef092ecfde5128067434bb7989def19cfe95c06bfd71de07ba0  rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.asc
+sha256 9cad816c989c991ffd342d03956b54209d7d32743ebb9b0624b2d36d5bbd525f  rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc
+sha256 c7ac98e7a7c3757b5bb8bde596455d50a8787236e290bc1f49e2d59d486ae564  rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.asc
+sha256 4ec3cade12e2e527f81d0b315e6a37152bf73938aab4a9216aef7d06ef913eb6  rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.asc
+sha256 0ab78e0cb710f35d108abce90bbf426947fed6222d2f6c04c9eba4ca00adea06  rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.asc
+sha256 4bc32bf4660a9fc5cd2af9e09f1bfb668b335442097fed6f3892b50950e97d3c  rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc
+sha256 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f  rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc
+sha256 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e  rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz
 # Locally generated
 sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2  LICENSE-APACHE
 sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
package/rust-bin/rust-bin.mk +4 -3
index 624ec94b40..a374215e20 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUST_BIN_VERSION = 1.29.2
+RUST_BIN_VERSION = 1.33.0
 RUST_BIN_SITE = https://static.rust-lang.org/dist
 RUST_BIN_LICENSE = Apache-2.0 or MIT
 RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
@@ -28,8 +28,9 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT
 		$(call suitable-extractor,$(f)) $(HOST_RUST_BIN_DL_DIR)/$(f) | \
 			$(TAR) -C $(@D)/std $(TAR_OPTIONS) -
 	)
-	cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME); \
-		ln -sf ../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib
+	mkdir -p $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib
+	cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib; \
+		ln -sf ../../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* .
 endef
 
 HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT
Signature · 1 line
2.17.2
#4 lore raw

PATCH 3/3 rust: bump version to 1.33.0

In reply to Eric Le Bihan

Bump rust to 1.33.0 with the following changes:

- drop support for jemalloc
- add dependency on host-openssl
- add a patch to fix bootstraping with rust 1.33.0 [1]

[1] https://github.com/rust-lang/rust/pull/57765

---
 ...esence-of-LLVM-library-in-stage0-lib.patch | 264 ++++++++++++++++++
 package/rust/rust.hash                        |   5 +-
 package/rust/rust.mk                          |  12 +-
 3 files changed, 269 insertions(+), 12 deletions(-)
 create mode 100644 package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch
package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch new file +264 -0
new file mode 100644
index 0000000000..0c756e3028
@@ -0,0 +1,264 @@
+From 2d21df8a3fd7a68ba9f52389ead7f06f13190c12 Mon Sep 17 00:00:00 2001
+From: Mark Rousskov <[email protected]>
+Date: Mon, 21 Jan 2019 17:47:57 -0700
+Subject: [PATCH] Workaround presence of LLVM library in stage0/lib
+
+This commit works around the newly-introduced LLVM shared library.
+
+This is needed such that llvm-config run from
+librustc_llvm's build script can correctly locate it's own LLVM, not the
+one in stage0/lib. The LLVM build system uses the DT_RUNPATH/RUNPATH
+header within the llvm-config binary, which we want to use, but because
+Cargo always adds the host compiler's "libdir" (stage0/lib in our
+case) to the dynamic linker's search path, we weren't properly finding
+the freshly-built LLVM in llvm/lib. By restoring the environment
+variable setting the search path to what bootstrap sees, the problem is
+resolved and librustc_llvm correctly links and finds the appropriate
+LLVM.
+
+Several run-make-fulldeps tests are also updated with similar handling.
+
+Signed-off-by: Eric Le Bihan <[email protected]>
+---
+ src/bootstrap/builder.rs                      |  9 ++++++++-
+ src/bootstrap/compile.rs                      |  1 +
+ src/bootstrap/util.rs                         |  6 +++++-
+ src/build_helper/lib.rs                       | 19 +++++++++++++++++++
+ src/librustc_asan/build.rs                    |  2 ++
+ src/librustc_llvm/build.rs                    |  2 ++
+ src/librustc_lsan/build.rs                    |  2 ++
+ src/librustc_msan/build.rs                    |  2 ++
+ src/librustc_tsan/build.rs                    |  2 ++
+ .../cross-lang-lto-upstream-rlibs/Makefile    |  4 ++--
+ .../run-make-fulldeps/cross-lang-lto/Makefile | 19 ++++++++++---------
+ 11 files changed, 55 insertions(+), 13 deletions(-)
+
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index a69ba20749..f742bce180 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -21,7 +21,7 @@ use crate::install;
+ use crate::native;
+ use crate::test;
+ use crate::tool;
+-use crate::util::{add_lib_path, exe, libdir};
++use crate::util::{self, add_lib_path, exe, libdir};
+ use crate::{Build, DocTests, Mode, GitRepo};
+ 
+ pub use crate::Compiler;
+@@ -791,6 +791,13 @@ impl<'a> Builder<'a> {
+             .env("CARGO_TARGET_DIR", out_dir)
+             .arg(cmd);
+ 
++        // See comment in librustc_llvm/build.rs for why this is necessary, largely llvm-config
++        // needs to not accidentally link to libLLVM in stage0/lib.
++        cargo.env("REAL_LIBRARY_PATH_VAR", &util::dylib_path_var());
++        if let Some(e) = env::var_os(util::dylib_path_var()) {
++            cargo.env("REAL_LIBRARY_PATH", e);
++        }
++
+         if cmd != "install" {
+             cargo.arg("--target")
+                  .arg(target);
+diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
+index b581271663..ec04dee6c3 100644
+--- a/src/bootstrap/compile.rs
++++ b/src/bootstrap/compile.rs
+@@ -712,6 +712,7 @@ pub fn build_codegen_backend(builder: &Builder,
+             if builder.is_rust_llvm(target) && backend != "emscripten" {
+                 cargo.env("LLVM_RUSTLLVM", "1");
+             }
++
+             cargo.env("LLVM_CONFIG", &llvm_config);
+             if backend != "emscripten" {
+                 let target_config = builder.config.target_config.get(&target);
+diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
+index 2880f1a084..37c6c040da 100644
+--- a/src/bootstrap/util.rs
++++ b/src/bootstrap/util.rs
+@@ -70,7 +70,11 @@ pub fn dylib_path_var() -> &'static str {
+ /// Parses the `dylib_path_var()` environment variable, returning a list of
+ /// paths that are members of this lookup path.
+ pub fn dylib_path() -> Vec<PathBuf> {
+-    env::split_paths(&env::var_os(dylib_path_var()).unwrap_or_default()).collect()
++    let var = match env::var_os(dylib_path_var()) {
++        Some(v) => v,
++        None => return vec![],
++    };
++    env::split_paths(&var).collect()
+ }
+ 
+ /// `push` all components to `buf`. On windows, append `.exe` to the last component.
+diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs
+index 5a704e5577..c66c5c9249 100644
+--- a/src/build_helper/lib.rs
++++ b/src/build_helper/lib.rs
+@@ -23,6 +23,25 @@ macro_rules! t {
+     };
+ }
+ 
++// Because Cargo adds the compiler's dylib path to our library search path, llvm-config may
++// break: the dylib path for the compiler, as of this writing, contains a copy of the LLVM
++// shared library, which means that when our freshly built llvm-config goes to load it's
++// associated LLVM, it actually loads the compiler's LLVM. In particular when building the first
++// compiler (i.e., in stage 0) that's a problem, as the compiler's LLVM is likely different from
++// the one we want to use. As such, we restore the environment to what bootstrap saw. This isn't
++// perfect -- we might actually want to see something from Cargo's added library paths -- but
++// for now it works.
++pub fn restore_library_path() {
++    println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH_VAR");
++    println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH");
++    let key = env::var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR");
++    if let Some(env) = env::var_os("REAL_LIBRARY_PATH") {
++        env::set_var(&key, &env);
++    } else {
++        env::remove_var(&key);
++    }
++}
++
+ pub fn run(cmd: &mut Command) {
+     println!("running: {:?}", cmd);
+     run_silent(cmd);
+diff --git a/src/librustc_asan/build.rs b/src/librustc_asan/build.rs
+index 2d921b6669..b42d775deb 100644
+--- a/src/librustc_asan/build.rs
++++ b/src/librustc_asan/build.rs
+@@ -8,6 +8,8 @@ use cmake::Config;
+ 
+ fn main() {
+     if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
++        build_helper::restore_library_path();
++
+         let (native, target) = match sanitizer_lib_boilerplate("asan") {
+             Ok(native) => native,
+             _ => return,
+diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
+index ec3dff783c..cd91fcb299 100644
+--- a/src/librustc_llvm/build.rs
++++ b/src/librustc_llvm/build.rs
+@@ -24,6 +24,8 @@ fn main() {
+         return;
+     }
+ 
++    build_helper::restore_library_path();
++
+     let target = env::var("TARGET").expect("TARGET was not set");
+     let llvm_config = env::var_os("LLVM_CONFIG")
+         .map(PathBuf::from)
+diff --git a/src/librustc_lsan/build.rs b/src/librustc_lsan/build.rs
+index 470f2bb3e5..ad528bb039 100644
+--- a/src/librustc_lsan/build.rs
++++ b/src/librustc_lsan/build.rs
+@@ -8,6 +8,8 @@ use cmake::Config;
+ 
+ fn main() {
+     if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
++        build_helper::restore_library_path();
++
+         let (native, target) = match sanitizer_lib_boilerplate("lsan") {
+             Ok(native) => native,
+             _ => return,
+diff --git a/src/librustc_msan/build.rs b/src/librustc_msan/build.rs
+index e1140278f2..085514b5a0 100644
+--- a/src/librustc_msan/build.rs
++++ b/src/librustc_msan/build.rs
+@@ -8,6 +8,8 @@ use cmake::Config;
+ 
+ fn main() {
+     if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
++        build_helper::restore_library_path();
++
+         let (native, target) = match sanitizer_lib_boilerplate("msan") {
+             Ok(native) => native,
+             _ => return,
+diff --git a/src/librustc_tsan/build.rs b/src/librustc_tsan/build.rs
+index f63bb46b87..0db3db392d 100644
+--- a/src/librustc_tsan/build.rs
++++ b/src/librustc_tsan/build.rs
+@@ -8,6 +8,8 @@ use cmake::Config;
+ 
+ fn main() {
+     if let Some(llvm_config) = env::var_os("LLVM_CONFIG") {
++        build_helper::restore_library_path();
++
+         let (native, target) = match sanitizer_lib_boilerplate("tsan") {
+             Ok(native) => native,
+             _ => return,
+diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile
+index 0a6f226a02..6992dab1a1 100644
+--- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile
++++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile
+@@ -9,7 +9,7 @@ all: staticlib.rs upstream.rs
+ 
+ 	# Check No LTO
+ 	$(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -L. -o $(TMPDIR)/staticlib.a
+-	(cd $(TMPDIR); llvm-ar x ./staticlib.a)
++	(cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a)
+ 	# Make sure the upstream object file was included
+ 	ls $(TMPDIR)/upstream.*.rcgu.o
+ 
+@@ -19,5 +19,5 @@ all: staticlib.rs upstream.rs
+ 	# Check ThinLTO
+ 	$(RUSTC) upstream.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin
+ 	$(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a
+-	(cd $(TMPDIR); llvm-ar x ./staticlib.a)
++	(cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a)
+ 	ls $(TMPDIR)/upstream.*.rcgu.o
+diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make-fulldeps/cross-lang-lto/Makefile
+index 1d072e03de..4d1fb7b953 100644
+--- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile
++++ b/src/test/run-make-fulldeps/cross-lang-lto/Makefile
+@@ -5,8 +5,9 @@
+ # LLVM bitcode files (as used by linker LTO plugins) when compiling with
+ # -Z cross-lang-lto.
+ 
+-ASSERT_IS_BITCODE_OBJ=llvm-bcanalyzer # this only succeeds for bitcode files
+-EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; llvm-ar x $(1))
++# this only succeeds for bitcode files
++ASSERT_IS_BITCODE_OBJ=($(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-bcanalyzer $(1))
++EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x $(1))
+ 
+ BUILD_LIB=$(RUSTC) lib.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1
+ BUILD_EXE=$(RUSTC) main.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 --emit=obj
+@@ -16,31 +17,31 @@ all: staticlib staticlib-fat-lto staticlib-thin-lto rlib exe cdylib rdylib
+ staticlib: lib.rs
+ 	$(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib.a
+ 	$(call EXTRACT_OBJS, liblib.a)
+-	for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
++	for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done
+ 
+ staticlib-fat-lto: lib.rs
+ 	$(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-fat-lto.a -Clto=fat
+ 	$(call EXTRACT_OBJS, liblib-fat-lto.a)
+-	for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
++	for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done
+ 
+ staticlib-thin-lto: lib.rs
+ 	$(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-thin-lto.a -Clto=thin
+ 	$(call EXTRACT_OBJS, liblib-thin-lto.a)
+-	for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
++	for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done
+ 
+ rlib: lib.rs
+ 	$(BUILD_LIB) --crate-type=rlib -o $(TMPDIR)/liblib.rlib
+ 	$(call EXTRACT_OBJS, liblib.rlib)
+-	for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
++	for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done
+ 
+ cdylib: lib.rs
+ 	$(BUILD_LIB) --crate-type=cdylib --emit=obj -o $(TMPDIR)/cdylib.o
+-	$(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/cdylib.o
++	$(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/cdylib.o)
+ 
+ rdylib: lib.rs
+ 	$(BUILD_LIB) --crate-type=dylib --emit=obj -o $(TMPDIR)/rdylib.o
+-	$(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/rdylib.o
++	$(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/rdylib.o)
+ 
+ exe: lib.rs
+ 	$(BUILD_EXE) -o $(TMPDIR)/exe.o
+-	$(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/exe.o
++	$(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/exe.o)
+-- 
+2.17.2
+
package/rust/rust.hash +3 -2
index 1caab5a4ca..62e2e1855c 100644
@@ -1,5 +1,6 @@
-# From https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.xz.sha256
-sha256 bc7b9d4c041fe8454892a4211a116a4d5243cb04583a18c5292914fc829cb2f6  rustc-1.29.2-src.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.asc
+sha256 f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71  rustc-1.33.0-src.tar.xz
 # Locally generated
 sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2  LICENSE-APACHE
 sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
package/rust/rust.mk +2 -10
index bf110f8ade..5d14fc6682 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUST_VERSION = 1.29.2
+RUST_VERSION = 1.33.0
 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz
 RUST_SITE = https://static.rust-lang.org/dist
 RUST_LICENSE = Apache-2.0 or MIT
@@ -16,17 +16,10 @@ HOST_RUST_DEPENDENCIES = \
 	toolchain \
 	host-rust-bin \
 	host-cargo-bin \
+	host-openssl \
 	host-python \
 	$(BR2_CMAKE_HOST_DEPENDENCY)
 
-ifeq ($(BR2_PACKAGE_JEMALLOC),y)
-HOST_RUST_DEPENDENCIES += jemalloc
-HOST_RUST_JEMALLOC_ENABLED = true
-HOST_RUST_JEMALLOC_CONF = 'jemalloc = "$(STAGING_DIR)/usr/lib/libjemalloc_pic.a"'
-else
-HOST_RUST_JEMALLOC_ENABLED = false
-endif
-
 HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)
 
 # Some vendor crates contain Cargo.toml.orig files. The associated
@@ -60,7 +53,6 @@ define HOST_RUST_CONFIGURE_CMDS
 		echo '[install]'; \
 		echo 'prefix = "$(HOST_DIR)"'; \
 		echo '[rust]'; \
-		echo 'use-jemalloc = $(HOST_RUST_JEMALLOC_ENABLED)'; \
 		echo 'channel = "stable"'; \
 		echo '[target.$(RUSTC_TARGET_NAME)]'; \
 		echo 'cc = "$(TARGET_CROSS)gcc"'; \
Signature · 1 line
2.17.2