Merge pull request meta-rust#376 from ColinFinck/rust-1.58.1

Import Rust 1.58.1 from openembedded-core, remove Rust 1.51.0
compenguy · Feb 21, 2022 · c654f5c · c654f5c
2 parents 4bde33e + 297dbb9
commit c654f5c
Show file tree

Hide file tree

Showing 37 changed files with 260 additions and 536 deletions.
diff --git a/recipes-devtools/cargo/cargo-1.51.0/0001-Disable-http2.patch b/recipes-devtools/cargo/cargo-1.51.0/0001-Disable-http2.patch
diff --git a/recipes-devtools/cargo/cargo-1.51.0/riscv-march.patch b/recipes-devtools/cargo/cargo-1.51.0/riscv-march.patch
diff --git a/recipes-devtools/cargo/cargo-1.51.0/rv64gc.patch b/recipes-devtools/cargo/cargo-1.51.0/rv64gc.patch
diff --git a/recipes-devtools/cargo/cargo-cross-canadian_1.51.0.bb b/recipes-devtools/cargo/cargo-cross-canadian_1.51.0.bb
diff --git a/recipes-devtools/cargo/cargo-cross-canadian_1.58.1.bb b/recipes-devtools/cargo/cargo-cross-canadian_1.58.1.bb
@@ -0,0 +1,6 @@
+require recipes-devtools/rust/rust-source.inc
+require recipes-devtools/rust/rust-snapshot.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/cargo-${PV}:"
+
+require cargo-cross-canadian.inc
diff --git a/recipes-devtools/cargo/cargo.inc b/recipes-devtools/cargo/cargo.inc
@@ -14,15 +14,23 @@ LIC_FILES_CHKSUM = " \
 
 S = "${RUSTSRC}/src/tools/cargo"
 CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
+EXCLUDE_FROM_WORLD = "1"
 
-inherit cargo
+inherit cargo pkgconfig
 
 do_cargo_setup_snapshot () {
 	${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig
+	# Need to use uninative's loader if enabled/present since the library paths
+	# are used internally by rust and result in symbol mismatches if we don't
+	if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then
+		patchelf-uninative ${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo --set-interpreter ${UNINATIVE_LOADER}
+	fi
 }
 
 addtask cargo_setup_snapshot after do_unpack before do_configure
 do_cargo_setup_snapshot[dirs] += "${WORKDIR}/${CARGO_SNAPSHOT}"
+do_cargo_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER"
+
 
 do_compile:prepend () {
 	export RUSTC_BOOTSTRAP="1"
@@ -42,8 +50,6 @@ do_install () {
 # Needed for pkg-config to be used
 export LIBSSH2_SYS_USE_PKG_CONFIG = "1"
 
-BBCLASSEXTEND = "native nativesdk"
-
 # When building cargo-native we don't have cargo-native to use and depend on,
 # so we must use the locally set up snapshot to bootstrap the build.
 BASEDEPENDS:remove:class-native = "cargo-native"

diff --git a/recipes-devtools/cargo/cargo_1.51.0.bb b/recipes-devtools/cargo/cargo_1.51.0.bb
diff --git a/recipes-devtools/cargo/cargo_1.54.0.bb b/recipes-devtools/cargo/cargo_1.54.0.bb
@@ -1,4 +1,4 @@
 require recipes-devtools/rust/rust-source-${PV}.inc
 require recipes-devtools/rust/rust-snapshot-${PV}.inc
 require cargo.inc
-
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/cargo/cargo_1.58.1.bb b/recipes-devtools/cargo/cargo_1.58.1.bb
@@ -0,0 +1,4 @@
+require recipes-devtools/rust/rust-source.inc
+require recipes-devtools/rust/rust-snapshot.inc
+require cargo.inc
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/rust/files/riscv-march.patch b/recipes-devtools/rust/files/riscv-march.patch
diff --git a/recipes-devtools/rust/files/rv64gc.patch b/recipes-devtools/rust/files/rv64gc.patch
diff --git a/recipes-devtools/rust/libstd-rs-1.51.0/0004-Update-1.51.0-checksums-for-modified-files.patch b/recipes-devtools/rust/libstd-rs-1.51.0/0004-Update-1.51.0-checksums-for-modified-files.patch