Merge pull request #221 from stfl/sumo_cargo_22

libstd don't fail if incremental build files don't exist (sumo)

Jenkinsfile

@@ -15,7 +15,7 @@ for (int i = 0; i < targets.size(); i++) {
                     sh "./scripts/setup-env.sh"
                 }
                 stage("fetch $machine") {
-                    sh "GIT_LOCAL_REF_DIR=/srv/git-cache/ ./scripts/fetch.sh master"
+                    sh "GIT_LOCAL_REF_DIR=/srv/git-cache/ ./scripts/fetch.sh sumo"
                 }
                 stage("build $machine") {
                     sh "MACHINE=${machine} ./scripts/build.sh"
@@ -25,7 +25,7 @@ for (int i = 0; i < targets.size(); i++) {
                 throw e
             } finally {
                 stage("push build cache $machine") {
-                    sh "./scripts/publish-build-cache.sh master"
+                    sh "./scripts/publish-build-cache.sh sumo"
                 }
                 stage("cleanup $machine") {
                     sh "./scripts/cleanup-env.sh"

classes/cargo.bbclass

@@ -23,13 +23,11 @@ B = "${S}"
 export RUST_BACKTRACE = "1"
 
 RUSTFLAGS ??= ""
-BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
-CARGO_BUILD_FLAGS = "-v --target ${HOST_SYS} ${BUILD_MODE}"
+CARGO_BUILD_FLAGS = "-v --target ${HOST_SYS} --release"
 
 # This is based on the content of CARGO_BUILD_FLAGS and generally will need to
 # change if CARGO_BUILD_FLAGS changes.
-BUILD_DIR = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
-CARGO_TARGET_SUBDIR="${HOST_SYS}/${BUILD_DIR}"
+CARGO_TARGET_SUBDIR="${HOST_SYS}/release"
 oe_cargo_build () {
 	export RUSTFLAGS="${RUSTFLAGS}"
 	export RUST_TARGET_PATH="${RUST_TARGET_PATH}"

classes/cargo_common.bbclass

@@ -20,14 +20,6 @@ export CARGO_HOME = "${WORKDIR}/cargo_home"
 # for cross compilation, so tell it we know better than it.
 export PKG_CONFIG_ALLOW_CROSS = "1"
 
-# Don't instruct cargo to use crates downloaded by bitbake. Some rust packages,
-# for example the rust compiler itself, come with their own vendored sources.
-# Specifying two [source.crates-io] will not work.
-CARGO_DISABLE_BITBAKE_VENDORING ?= "0"
-
-# Used by libstd-rs to point to the vendor dir included in rustc src
-CARGO_VENDORING_DIRECTORY ?= "${CARGO_HOME}/bitbake"
-
 cargo_common_do_configure () {
 	mkdir -p ${CARGO_HOME}/bitbake
 	echo "paths = [" > ${CARGO_HOME}/config
@@ -40,10 +32,10 @@ cargo_common_do_configure () {
 	# Point cargo at our local mirror of the registry
 	cat <<- EOF >> ${CARGO_HOME}/config
 	[source.bitbake]
-	directory = "${CARGO_VENDORING_DIRECTORY}"
+	directory = "${CARGO_HOME}/bitbake"
 	EOF
 
-	if [ -z "${EXTERNALSRC}" ] && [ ${CARGO_DISABLE_BITBAKE_VENDORING} = "0" ]; then
+	if [ "${EXTERNALSRC}" == "" ]; then
 		cat <<- EOF >> ${CARGO_HOME}/config
 		[source.crates-io]
 		replace-with = "bitbake"
@@ -51,22 +43,6 @@ cargo_common_do_configure () {
 		EOF
 	fi
 
-        # Disable multiplexing in order to keep cargo from using http2, which we
-        # can't currently enable because of dependency loops
-        cat <<- EOF >> ${CARGO_HOME}/config
-		[http]
-		multiplexing = false
-	EOF
-
-	# When a sstate-cache is used sometimes the certificates are not available
-	# at the compile time path anymore. Set it explicitly instead.
-	echo "cainfo = \"${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt\"" \
-		>> ${CARGO_HOME}/config
-
-	if [ -n "${http_proxy}" ]; then
-		echo "proxy = \"${http_proxy}\"" >> ${CARGO_HOME}/config
-	fi
-
 	echo "[target.${HOST_SYS}]" >> ${CARGO_HOME}/config
 	echo "linker = '${RUST_TARGET_CCLD}'" >> ${CARGO_HOME}/config
 	if [ "${HOST_SYS}" != "${BUILD_SYS}" ]; then
@@ -84,7 +60,7 @@ oe_cargo_fix_env () {
 	export TARGET_CC="${RUST_TARGET_CC}"
 	export TARGET_CXX="${RUST_TARGET_CXX}"
 	export TARGET_CFLAGS="${CFLAGS}"
-	export TARGET_CXXFLAGS="${CXXFLAGS}"
+	export TARGET_CFLAGS="${CXXFLAGS}"
 	export TARGET_AR="${AR}"
 	export HOST_CC="${RUST_BUILD_CC}"
 	export HOST_CXX="${RUST_BUILD_CXX}"

classes/rust-common.bbclass

@@ -1,37 +1,18 @@
 # Common variables used by all Rust builds
 export rustlibdir = "${libdir}/rust"
 FILES_${PN} += "${rustlibdir}/*.so"
-FILES_${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta"
+FILES_${PN}-dev += "${rustlibdir}/*.rlib"
 FILES_${PN}-dbg += "${rustlibdir}/.debug"
 
 RUSTLIB = "-L ${STAGING_LIBDIR}/rust"
-RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+RUST_DEBUG_REMAP = "-Zremap-path-prefix-from=${WORKDIR} -Zremap-path-prefix-to=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
 RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}"
 RUSTLIB_DEP ?= "libstd-rs"
 RUST_TARGET_PATH = "${STAGING_LIBDIR_NATIVE}/rustlib"
 RUST_PANIC_STRATEGY ?= "unwind"
 
-# Native builds are not effected by TCLIBC. Without this, rust-native
-# thinks it's "target" (i.e. x86_64-linux) is a musl target.
-RUST_LIBC = "${TCLIBC}"
-RUST_LIBC_class-native = "glibc"
-
-def determine_libc(d, thing):
-    '''Determine which libc something should target'''
-
-    # BUILD is never musl, TARGET may be musl or glibc,
-    # HOST could be musl, but only if a compiler is built to be run on
-    # target in which case HOST_SYS != BUILD_SYS.
-    if thing == 'TARGET':
-        libc = d.getVar('RUST_LIBC')
-    elif thing == 'BUILD' and (d.getVar('HOST_SYS') != d.getVar('BUILD_SYS')):
-        libc = d.getVar('RUST_LIBC')
-    else:
-        libc = d.getVar('RUST_LIBC_class-native')
-
-    return libc
-
 # Responsible for taking Yocto triples and converting it to Rust triples
+
 def rust_base_triple(d, thing):
     '''
     Mangle bitbake's *_SYS into something that rust might support (see
@@ -44,7 +25,7 @@ def rust_base_triple(d, thing):
     # All the Yocto targets are Linux and are 'unknown'
     vendor = "-unknown"
     os = d.getVar('{}_OS'.format(thing))
-    libc = determine_libc(d, thing)
+    libc = d.getVar('TCLIBC')
 
     # Prefix with a dash and convert glibc -> gnu
     if libc == "glibc":
@@ -110,7 +91,7 @@ create_wrapper () {
 
 	cat <<- EOF > "${file}"
 	#!/bin/sh
-	exec $@ "\$@"
+	$@ "\$@"
 	EOF
 	chmod +x "${file}"
 }

conf/layer.conf

@@ -9,7 +9,7 @@ BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_rust-layer = "7"
 
 LAYERDEPENDS_rust-layer = "core openembedded-layer"
-LAYERSERIES_COMPAT_rust-layer = "rocko sumo thud warrior zeus dunfell"
+LAYERSERIES_COMPAT_rust-layer = "sumo"
 
 # Override security flags
 require conf/distro/include/rust_security_flags.inc

recipes-core/aho-corasick/aho-corasick-rs_0.2.1.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "Fast multiple substring searching with finite state machines."
+HOMEPAGE = "https://github.com/BurntSushi/aho-corasick"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=8d0d0aa488af0ab9aafa3b85a7fc8e12"
+DEPENDS = "memchr-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/BurntSushi/aho-corasick.git;protocol=https"
+SRCREV = "e1bca33dcc060d587e802320a79cbb035f37f8fa"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}
+
+BBCLASSEXTEND += "native"

recipes-core/bitflags/bitflags_0.8.2.bb

@@ -0,0 +1,26 @@
+DESCRIPTION = "A macro to generate structures which behave like bitflags."
+HOMEPAGE = "https://github.com/rust-lang-nursery/bitflags"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang-nursery/bitflags.git;protocol=https;nobranch=1"
+SRCREV = "e30da43cac0e52fc8d0007ce99a316ec6473033e"
+
+S = "${WORKDIR}/git"
+
+LIB_SRC = "${S}/src/lib.rs"
+CRATE_TYPE = "rlib"
+RUSTFLAGS += "-A pub_use_of_private_extern_crate"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/crypto/crypto-rs_0.2.31.bb

@@ -0,0 +1,28 @@
+DESCRIPTION = "A (mostly) pure-Rust implementation of various common cryptographic algorithms."
+HOMEPAGE = "https://github.com/DaGenix/rust-crypto/"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=4311034aa04489226c1fc3f816dbfb5a \
+	file://LICENSE-APACHE;md5=a02fef6dccf840318474c108a8281b77 \
+"
+DEPENDS = "\
+	libc-rs \
+	time-rs \
+	rand-rs \
+	rustc-serialize-rs \
+"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/DaGenix/rust-crypto.git;protocol=https"
+SRCREV = "5571cb41690b9cee12025192393ea7df0eddc21b"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/dbus/dbus-rs_0.1.0.bb

@@ -0,0 +1,20 @@
+DESCRIPTION = "DBus binding for rust"
+HOMEPAGE = "https://github.com/diwic/dbus-rs"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
+DEPENDS = "libc-rs dbus"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/diwic/dbus-rs.git;protocol=https"
+SRCREV = "d23c8b7fecd5a8e82131893250a5ac376799faff"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/debug-builders/debug-builders-rs_0.1.0.bb

@@ -0,0 +1,19 @@
+DESCRIPTION = "A copy of libstd's debug builders for use before they stabilize"
+HOMEPAGE = "https://github.com/sfackler/rust-debug-builders"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "file://Cargo.toml;md5=97a131dc4ae910d242387f2c9d1a2ce8"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/sfackler/rust-debug-builders.git;protocol=https"
+SRCREV = "c6943b72c7808ddaa151d08b824525cc7420cb9b"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/getopts/getopts-rs_0.2.11.bb

@@ -0,0 +1,23 @@
+DESCRIPTION = "getopts-like option parsing"
+HOMEPAGE = "https://github.com/rust-lang/getopts"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+DEPENDS = "log-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang/getopts.git;protocol=https"
+SRCREV = "a13c62b7d860b6d370129ebb972bf5e0373c5be7"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/lazy-static/lazy-static_0.2.1.bb

@@ -0,0 +1,23 @@
+DESCRIPTION = "A macro for declaring lazily evaluated statics in Rust."
+HOMEPAGE = "https://github.com/rust-lang-nursery/lazy-static.rs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE;md5=5795ddb4df1d696d439b6667081cffc9 \
+"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang-nursery/lazy-static.rs.git;protocol=https"
+SRCREV = "ffe65c818474f863945ca535c0e53f3b8b848ff7"
+
+S = "${WORKDIR}/git"
+
+LIB_SRC = "${S}/src/lib.rs"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/libc/libc-rs_0.2.21.bb

@@ -0,0 +1,27 @@
+DESCRIPTION = "A Rust library with native bindings to the types and functions commonly found on various systems, including libc."
+HOMEPAGE = "https://github.com/rust-lang/libc"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang/libc.git;protocol=https"
+SRCREV = "05a2d197356ef253dfd985166576619ac9b6947f"
+
+S = "${WORKDIR}/git"
+
+LIB_SRC = "${S}/src/lib.rs"
+
+do_compile () {
+	oe_compile_rust_lib --cfg feature='"cargo-build"' --cfg feature='"use_std"'
+
+}
+
+do_install () {
+	oe_install_rust_lib
+}
+
+BBCLASSEXTEND += "native"

recipes-core/log/env-logger-rs_0.3.1.bb

@@ -0,0 +1,6 @@
+DESCRIPTION = "An logging implementation for `log` which is configured via an environment variable"
+DEPENDS = "regex-rs log-rs"
+
+require log.inc
+
+LIB_SRC = "${S}/env/src/lib.rs"

recipes-core/log/log-rs.bb

@@ -0,0 +1,4 @@
+DESCRIPTION = "A Rust library providing a lightweight logging facade"
+DEPENDS = "libc-rs"
+
+require log.inc

recipes-core/log/log.inc

@@ -0,0 +1,22 @@
+HOMEPAGE = "https://github.com/rust-lang/log"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang/log.git;protocol=https"
+SRCREV = "5453e16166ec451afc9738978ca01f162127ebbe"
+PV = "0.3.1"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/memchr/memchr-rs_0.1.11.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "Safe interface to memchr"
+HOMEPAGE = "https://github.com/BurntSushi/rust-memchr"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=8d0d0aa488af0ab9aafa3b85a7fc8e12"
+DEPENDS = "libc-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/BurntSushi/rust-memchr.git;protocol=https"
+SRCREV = "4f9a13f95e6e00f2847c093c56b41b9c1d58d3c4"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}
+
+BBCLASSEXTEND += "native"

recipes-core/num/num-integer_0.1.34.bb

@@ -0,0 +1,5 @@
+require num.inc
+
+DEPENDS += "num-traits"
+
+LIB_SRC = "${S}/integer/src/lib.rs"

recipes-core/num/num-iter_0.1.34.bb

@@ -0,0 +1,6 @@
+require num.inc
+
+DEPENDS += "num-traits"
+DEPENDS += "num-integer"
+
+LIB_SRC = "${S}/iter/src/lib.rs"

recipes-core/num/num-traits_0.1.34.bb

@@ -0,0 +1,3 @@
+require num.inc
+
+LIB_SRC = "${S}/traits/src/lib.rs"

recipes-core/num/num.inc

@@ -0,0 +1,22 @@
+DESCRIPTION = "A collection of numeric types and traits for Rust, including bigint, complex, rational, range iterators, generic integers, and more!"
+HOMEPAGE = "https://github.com/rust-num/num"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-num/num.git;protocol=https"
+SRCREV = "d9f08cb148cc686ec407c1e42fbd4536cde6ac82"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/num/num_0.1.34.bb

@@ -0,0 +1,9 @@
+require num.inc
+
+DEPENDS += "\
+	num-traits \
+	num-integer \
+	num-iter \
+	"
+
+LIB_SRC = "${S}/src/lib.rs"

recipes-core/rand/rand-rs_0.3.14.bb

@@ -0,0 +1,23 @@
+DESCRIPTION = "Random number generators and other randomness functionality."
+HOMEPAGE = "https://github.com/rust-lang/rand"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+DEPENDS = "libc-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang/rand.git;protocol=https"
+SRCREV = "f872fda5fb8fb899a837ee9eee0332076a8f5300"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/regex/regex-rs.bb

@@ -0,0 +1,12 @@
+DESCRIPTION = "An implementation of regular expressions for Rust"
+DEPENDS = "\
+	aho-corasick-rs \
+	memchr-rs \
+	regex-syntax-rs \
+"
+
+require regex.inc
+
+S = "${WORKDIR}/git"
+
+BBCLASSEXTEND += "native"

recipes-core/regex/regex-syntax-rs.bb

@@ -0,0 +1,7 @@
+DESCRIPTION = "A regular expression parser"
+
+require regex.inc
+
+LIB_SRC = "${S}/regex-syntax/src/lib.rs"
+
+BBCLASSEXTEND += "native"

recipes-core/regex/regex.inc

@@ -0,0 +1,22 @@
+HOMEPAGE = "https://github.com/rust-lang/regex"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+SRC_URI = "git://github.com/rust-lang/regex.git;protocol=https"
+SRCREV = "c9e6781a6845478aa2d8ebc86972755f854fdbe0"
+PV = "0.1.38"
+
+inherit rust-bin
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/rustc-serialize/rustc-serialize-rs_0.3.19.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "Generic serialization/deserialization support"
+HOMEPAGE = "https://github.com/rust-lang/rustc-serialize"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang/rustc-serialize.git;protocol=https"
+SRCREV = "64b38a1f31a9af6eabf2894437aa5ccc3e457e68"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/time/time-rs_0.1.38.bb

@@ -0,0 +1,23 @@
+DESCRIPTION = "Utilities for working with time-related functions in Rust"
+HOMEPAGE = "https://github.com/rust-lang/time"
+LICENSE = "MIT | Apache-2.0"
+LIC_FILES_CHKSUM = "\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+DEPENDS = "libc-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/rust-lang/time.git;protocol=https"
+SRCREV = "d265b7cf9f50db74fbd0a01f8bec90ad7d239d48"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/udev/libudev-rs_0.1.0.bb

@@ -0,0 +1,20 @@
+DESCRIPTION = "FFI bindings to libudev"
+HOMEPAGE = "https://github.com/dcuddeback/libudev-sys"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bbd2acd29c4ba5d4591b03e2757c04a3"
+DEPENDS = "libudev-sys-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/dcuddeback/libudev-rs.git;protocol=https"
+SRCREV = "d55763c626790e2e8724947503238731843a969a"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/udev/libudev-rs_0.1.2.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "FFI bindings to libudev"
+HOMEPAGE = "https://github.com/dcuddeback/libudev-sys"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bbd2acd29c4ba5d4591b03e2757c04a3"
+
+DEPENDS += "libudev-sys-rs"
+DEPENDS += "libc-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/dcuddeback/libudev-rs.git;protocol=https"
+SRCREV = "3da791245f206d0cf5a856531c574b8646b0f059"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/udev/libudev-sys-rs_0.1.1.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "FFI bindings to libudev"
+HOMEPAGE = "https://github.com/dcuddeback/libudev-sys"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bbd2acd29c4ba5d4591b03e2757c04a3"
+DEPENDS = "libc-rs udev"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/dcuddeback/libudev-sys.git;protocol=https"
+SRCREV = "14c24afc61e3315dffddab2c7f36999a16a002d8"
+
+S = "${WORKDIR}/git"
+
+RUSTC_FLAGS += "-ludev"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/udev/libudev-sys-rs_0.1.3.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "FFI bindings to libudev"
+HOMEPAGE = "https://github.com/dcuddeback/libudev-sys"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bbd2acd29c4ba5d4591b03e2757c04a3"
+DEPENDS = "libc-rs udev"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/dcuddeback/libudev-sys.git;protocol=https"
+SRCREV = "c49163f87d4d109ec21bcf8f8c51db560ed31b22"
+
+S = "${WORKDIR}/git"
+
+RUSTC_FLAGS += "-ludev"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-core/unix-socket/unix-socket-rs_0.4.3.bb

@@ -0,0 +1,20 @@
+DESCRIPTION = "Unix domain socket bindings for Rust"
+HOMEPAGE = "https://github.com/sfackler/rust-unix-socket"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bde86283c1fd74e84ebc3cf6dd7011d0"
+DEPENDS = "libc-rs debug-builders-rs"
+
+inherit rust-bin
+
+SRC_URI = "git://github.com/sfackler/rust-unix-socket.git;protocol=https"
+SRCREV = "d0f47ae888267a718072c3be5eed42ba1f637097"
+
+S = "${WORKDIR}/git"
+
+do_compile () {
+	oe_compile_rust_lib
+}
+
+do_install () {
+	oe_install_rust_lib
+}

recipes-devtools/cargo/cargo-0.21.0.inc

@@ -0,0 +1,11 @@
+CARGO_SNAPSHOT = "cargo-0.20.0-${RUST_BUILD_SYS}"
+SRC_URI[cargo-snapshot.md5sum] = "63aa861b029eec9f559f4fb5a10c287d"
+SRC_URI[cargo-snapshot.sha256sum] = "a677d13b01d00ad13edf75c7d1b484421c7fc09338bf9ed6d456b4685bb42ed1"
+
+SRC_URI += "\
+	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot \
+"
+
+# When building cargo-native we don't have a built cargo to use so we must use
+# the snapshot to bootstrap the build of cargo
+CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/cargo/bin/cargo"

recipes-devtools/cargo/cargo-0.22.0.inc

@@ -0,0 +1,11 @@
+CARGO_SNAPSHOT = "cargo-0.21.0-${RUST_BUILD_SYS}"
+SRC_URI[cargo-snapshot.md5sum] = "0e5389d2e38a14933dda77db8172cb1f"
+SRC_URI[cargo-snapshot.sha256sum] = "caccf4ab039c806a9e6fdc7fe389cc88fb771e28e30d93c07a5c56ef845cdf57"
+
+SRC_URI += "\
+	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot \
+"
+
+# When building cargo-native we don't have a built cargo to use so we must use
+# the snapshot to bootstrap the build of cargo
+CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/cargo/bin/cargo"

recipes-devtools/cargo/cargo-0.25.0.inc

@@ -0,0 +1,12 @@
+CARGO_SNAPSHOT = "cargo-0.24.0-${RUST_BUILD_SYS}"
+
+SRC_URI[cargo-snapshot.md5sum] = "830041cfc8627d3f7187954993449cf9"
+SRC_URI[cargo-snapshot.sha256sum] = "ff8a454104aba20426ea898ed7515ec5da7de07d11733cdda17462455beb76e8"
+
+SRC_URI += "\
+    https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot \
+"
+
+# When building cargo-native we don't have a built cargo to use so we must use
+# the snapshot to bootstrap the build of cargo
+CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/cargo/bin/cargo"

recipes-devtools/cargo/cargo-1.34.2/0001-Disable-http2.patch

@@ -1,29 +0,0 @@
-From 44cf21036646e4849e9f8566db7decb7da917394 Mon Sep 17 00:00:00 2001
-From: Johan Anderholm <johan.anderholm@gmail.com>
-Date: Sun, 27 Jan 2019 10:19:00 +0100
-Subject: [PATCH] Disable http2
-
-http2 requires that curl is build with nghttp2 which in turn depends on
-many dependencies and ultimately a dependency loop in the case of
-curl-native. As long as multiplexing is disabled in cargo this should
-be fine.
-
-Upstream-Status: Inappropriate
-
----
- Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 8238380861d9..ced1defea459 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -24,7 +24,7 @@ bytesize = "1.0"
- crates-io = { path = "src/crates-io", version = "0.23" }
- crossbeam-utils = "0.6"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.19", features = ['http2'] }
-+curl = { version = "0.4.19" }
- curl-sys = "0.4.15"
- env_logger = "0.6.0"
- pretty_env_logger = { version = "0.3", optional = true }

recipes-devtools/cargo/cargo-1.36.0/0001-Disable-http2.patch

@@ -1,31 +0,0 @@
-From 42e65192b6f7520b7a05924856e00600961f6758 Mon Sep 17 00:00:00 2001
-From: Johan Anderholm <johan.anderholm@gmail.com>
-Date: Sun, 27 Jan 2019 10:19:00 +0100
-Subject: [PATCH] Disable http2
-
-http2 requires that curl is build with nghttp2 which in turn depends on
-many dependencies and ultimately a dependency loop in the case of
-curl-native. As long as multiplexing is disabled in cargo this should
-be fine.
-
-Upstream-Status: Inappropriate
----
- Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index c3fcacf5..bd6ec50b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -24,7 +24,7 @@ bytesize = "1.0"
- crates-io = { path = "src/crates-io", version = "0.25" }
- crossbeam-utils = "0.6"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.21", features = ['http2'] }
-+curl = { version = "0.4.21" }
- curl-sys = "0.4.18"
- env_logger = "0.6.0"
- pretty_env_logger = { version = "0.3", optional = true }
--- 
-2.11.0
-

recipes-devtools/cargo/cargo-1.37.0/0001-Disable-http2.patch

@@ -1,29 +0,0 @@
-From 0e2384133664ebeb548b782ad763c3a627c1bc66 Mon Sep 17 00:00:00 2001
-From: Johan Anderholm <johan.anderholm@gmail.com>
-Date: Sun, 27 Jan 2019 10:19:00 +0100
-Subject: [PATCH] Disable http2
-
-http2 requires that curl is build with nghttp2 which in turn depends on
-many dependencies and ultimately a dependency loop in the case of
-curl-native. As long as multiplexing is disabled in cargo this should
-be fine.
-
-Upstream-Status: Inappropriate
-
----
- src/tools/cargo/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index d15aa2513..ba9c77d25 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -24,7 +24,7 @@ bytesize = "1.0"
- crates-io = { path = "crates/crates-io", version = "0.26" }
- crossbeam-utils = "0.6"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.21", features = ['http2'] }
-+curl = { version = "0.4.21" }
- curl-sys = "0.4.18"
- env_logger = "0.6.0"
- pretty_env_logger = { version = "0.3", optional = true }

recipes-devtools/cargo/cargo-1.39.0/0001-Disable-http2.patch

@@ -1,29 +0,0 @@
-From 0e2384133664ebeb548b782ad763c3a627c1bc66 Mon Sep 17 00:00:00 2001
-From: Johan Anderholm <johan.anderholm@gmail.com>
-Date: Sun, 27 Jan 2019 10:19:00 +0100
-Subject: [PATCH] Disable http2
-
-http2 requires that curl is build with nghttp2 which in turn depends on
-many dependencies and ultimately a dependency loop in the case of
-curl-native. As long as multiplexing is disabled in cargo this should
-be fine.
-
-Upstream-Status: Inappropriate
-
----
- src/tools/cargo/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index d15aa2513..ba9c77d25 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -24,7 +24,7 @@ bytesize = "1.0"
- crates-io = { path = "crates/crates-io", version = "0.28" }
- crossbeam-utils = "0.6"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.21", features = ['http2'] }
-+curl = { version = "0.4.21" }
- curl-sys = "0.4.18"
- env_logger = "0.6.0"
- pretty_env_logger = { version = "0.3", optional = true }

recipes-devtools/cargo/cargo-1.40.0/0001-Disable-http2.patch

@@ -1,29 +0,0 @@
-From f0496287fb754e5b8dd1956f6a0addb55f3b06f5 Mon Sep 17 00:00:00 2001
-From: Johan Anderholm <johan.anderholm@gmail.com>
-Date: Sun, 27 Jan 2019 10:19:00 +0100
-Subject: [PATCH] Disable http2
-
-http2 requires that curl is build with nghttp2 which in turn depends on
-many dependencies and ultimately a dependency loop in the case of
-curl-native. As long as multiplexing is disabled in cargo this should
-be fine.
-
-Upstream-Status: Inappropriate
-
----
- src/tools/cargo/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index eea1f42a2..5159890f4 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -25,7 +25,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1" }
- crates-io = { path = "crates/crates-io", version = "0.29" }
- crossbeam-utils = "0.6"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.23", features = ["http2"] }
-+curl = { version = "0.4.23" }
- curl-sys = "0.4.22"
- env_logger = "0.7.0"
- pretty_env_logger = { version = "0.3", optional = true }

recipes-devtools/cargo/cargo-1.41.0/0001-Disable-http2.patch

@@ -1,29 +0,0 @@
-From e06774b9f2be4ff1f3404f2f10e25f99e3f3455b Mon Sep 17 00:00:00 2001
-From: Johan Anderholm <johan.anderholm@gmail.com>
-Date: Sun, 27 Jan 2019 10:19:00 +0100
-Subject: [PATCH] Disable http2
-
-http2 requires that curl is build with nghttp2 which in turn depends on
-many dependencies and ultimately a dependency loop in the case of
-curl-native. As long as multiplexing is disabled in cargo this should
-be fine.
-
-Upstream-Status: Inappropriate
-
----
- src/tools/cargo/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index fc9b69c03..2f4d3a949 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -25,7 +25,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1" }
- crates-io = { path = "crates/crates-io", version = "0.30" }
- crossbeam-utils = "0.7"
- crypto-hash = "0.3.1"
--curl = { version = "0.4.23", features = ["http2"] }
-+curl = { version = "0.4.23" }
- curl-sys = "0.4.22"
- env_logger = "0.7.0"
- pretty_env_logger = { version = "0.3", optional = true }

recipes-devtools/cargo/cargo.inc

@@ -1,43 +1,12 @@
-SUMMARY = "Cargo, a package manager for Rust."
-HOMEPAGE = "https://crates.io"
-LICENSE = "MIT | Apache-2.0"
 SECTION = "devel"
 
 DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2"
 
-LIC_FILES_CHKSUM = " \
-    file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+LIC_FILES_CHKSUM += " \
+file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
 "
 
-SRC_URI += "file://0001-Disable-http2.patch"
-
-S = "${RUSTSRC}/src/tools/cargo"
-CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
-
-inherit cargo
-
-do_cargo_setup_snapshot () {
-	${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig
-}
-
-addtask cargo_setup_snapshot after do_unpack before do_configure
-do_cargo_setup_snapshot[dirs] += "${WORKDIR}/${CARGO_SNAPSHOT}"
-
-do_compile_prepend () {
-	export RUSTC_BOOTSTRAP="1"
-}
-
-do_install () {
-	install -d "${D}${bindir}"
-	install -m 755 "${RUSTSRC}/target/${CARGO_TARGET_SUBDIR}/cargo" "${D}${bindir}"
-}
-
-# Needed for pkg-config to be used
+# Used in libgit2-sys's build.rs, needed for pkg-config to be used
 export LIBGIT2_SYS_USE_PKG_CONFIG = "1"
-export LIBSSH2_SYS_USE_PKG_CONFIG = "1"
 
 BBCLASSEXTEND = "native"
-
-# When building cargo-native we don't have a built cargo to use so we must use
-# the snapshot to bootstrap the build of cargo
-CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo"

recipes-devtools/cargo/cargo_0.21.0.bb

@@ -0,0 +1,136 @@
+# Auto-Generated by cargo-bitbake 0.3.8
+#
+inherit cargo
+
+# If this is git based prefer versioned ones if they exist
+# DEFAULT_PREFERENCE = "-1"
+
+# how to get cargo could be as easy as but default to a git checkout:
+# SRC_URI += "crate://crates.io/cargo/0.21.0"
+SRC_URI += "git://git@github.com/rust-lang/cargo.git;protocol=ssh;branch=rust-1.20.0"
+SRCREV = "5b4b8b2ae3f6a884099544ce66dbb41626110ece"
+S = "${WORKDIR}/git"
+CARGO_SRC_DIR=""
+
+
+# please note if you have entries that do not begin with crate://
+# you must change them to how that package can be fetched
+SRC_URI += " \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.5.3 \
+crate://crates.io/aho-corasick/0.6.3 \
+crate://crates.io/atty/0.2.2 \
+crate://crates.io/backtrace-sys/0.1.11 \
+crate://crates.io/backtrace/0.3.2 \
+crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/bufstream/0.1.3 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/cmake/0.1.24 \
+crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/curl-sys/0.3.14 \
+crate://crates.io/curl/0.4.7 \
+crate://crates.io/dbghelp-sys/0.2.0 \
+crate://crates.io/docopt/0.8.1 \
+crate://crates.io/dtoa/0.4.1 \
+crate://crates.io/env_logger/0.4.3 \
+crate://crates.io/error-chain/0.11.0-rc.2 \
+crate://crates.io/filetime/0.1.10 \
+crate://crates.io/flate2/0.2.19 \
+crate://crates.io/foreign-types/0.2.0 \
+crate://crates.io/fs2/0.4.2 \
+crate://crates.io/gcc/0.3.51 \
+crate://crates.io/git2-curl/0.7.0 \
+crate://crates.io/git2/0.6.6 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/hamcrest/0.1.1 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/idna/0.1.2 \
+crate://crates.io/itoa/0.3.1 \
+crate://crates.io/jobserver/0.1.6 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/lazy_static/0.2.8 \
+crate://crates.io/libc/0.2.25 \
+crate://crates.io/libgit2-sys/0.6.12 \
+crate://crates.io/libssh2-sys/0.2.6 \
+crate://crates.io/libz-sys/1.0.16 \
+crate://crates.io/log/0.3.8 \
+crate://crates.io/matches/0.1.6 \
+crate://crates.io/memchr/0.1.11 \
+crate://crates.io/memchr/1.0.1 \
+crate://crates.io/miniz-sys/0.1.9 \
+crate://crates.io/miow/0.2.1 \
+crate://crates.io/net2/0.2.29 \
+crate://crates.io/num-bigint/0.1.39 \
+crate://crates.io/num-complex/0.1.38 \
+crate://crates.io/num-integer/0.1.34 \
+crate://crates.io/num-iter/0.1.33 \
+crate://crates.io/num-rational/0.1.38 \
+crate://crates.io/num-traits/0.1.39 \
+crate://crates.io/num/0.1.39 \
+crate://crates.io/num_cpus/1.6.2 \
+crate://crates.io/openssl-probe/0.1.1 \
+crate://crates.io/openssl-sys/0.9.14 \
+crate://crates.io/openssl/0.9.14 \
+crate://crates.io/percent-encoding/1.0.0 \
+crate://crates.io/pkg-config/0.3.9 \
+crate://crates.io/psapi-sys/0.1.0 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/rand/0.3.15 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex-syntax/0.4.1 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/regex/0.2.2 \
+crate://crates.io/rustc-demangle/0.1.4 \
+crate://crates.io/rustc-serialize/0.3.24 \
+crate://crates.io/scoped-tls/0.1.0 \
+crate://crates.io/semver-parser/0.7.0 \
+crate://crates.io/semver/0.7.0 \
+crate://crates.io/serde/1.0.9 \
+crate://crates.io/serde_derive/1.0.9 \
+crate://crates.io/serde_derive_internals/0.15.1 \
+crate://crates.io/serde_ignored/0.0.3 \
+crate://crates.io/serde_json/1.0.2 \
+crate://crates.io/shell-escape/0.1.3 \
+crate://crates.io/socket2/0.2.1 \
+crate://crates.io/strsim/0.6.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/tar/0.4.13 \
+crate://crates.io/tempdir/0.3.5 \
+crate://crates.io/termcolor/0.3.2 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/thread_local/0.3.4 \
+crate://crates.io/toml/0.4.2 \
+crate://crates.io/unicode-bidi/0.3.4 \
+crate://crates.io/unicode-normalization/0.1.5 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/url/1.5.1 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/vcpkg/0.2.2 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/wincolor/0.1.4 \
+crate://crates.io/ws2_32-sys/0.2.1 \
+"
+
+
+
+# FIXME: update generateme with the real MD5 of the license file
+LIC_FILES_CHKSUM=" \
+file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+SUMMARY = "Cargo, a package manager for Rust."
+HOMEPAGE = "https://crates.io"
+LICENSE = "MIT | Apache-2.0"
+
+# includes this file if it exists but does not fail
+# this is useful for anything you may want to override from
+# what cargo-bitbake generates.
+include cargo-${PV}.inc
+include cargo.inc

recipes-devtools/cargo/cargo_0.22.0.bb

@@ -0,0 +1,151 @@
+# Auto-Generated by cargo-bitbake 0.3.9
+#
+inherit cargo
+
+# If this is git based prefer versioned ones if they exist
+# DEFAULT_PREFERENCE = "-1"
+
+# how to get cargo could be as easy as but default to a git checkout:
+# SRC_URI += "crate://crates.io/cargo/0.22.0"
+SRC_URI += "git://github.com/rust-lang/cargo.git;protocol=https;branch=rust-1.21.0"
+SRCREV = "3423351a5d75ac7377bb15987842aadcfd068ad2"
+S = "${WORKDIR}/git"
+CARGO_SRC_DIR=""
+
+
+# please note if you have entries that do not begin with crate://
+# you must change them to how that package can be fetched
+SRC_URI += " \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.5.3 \
+crate://crates.io/aho-corasick/0.6.3 \
+crate://crates.io/atty/0.2.2 \
+crate://crates.io/backtrace-sys/0.1.12 \
+crate://crates.io/backtrace/0.3.2 \
+crate://crates.io/bitflags/0.7.0 \
+crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/bufstream/0.1.3 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/cmake/0.1.24 \
+crate://crates.io/conv/0.3.3 \
+crate://crates.io/core-foundation-sys/0.4.4 \
+crate://crates.io/core-foundation/0.4.4 \
+crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/curl-sys/0.3.14 \
+crate://crates.io/curl/0.4.8 \
+crate://crates.io/custom_derive/0.1.7 \
+crate://crates.io/dbghelp-sys/0.2.0 \
+crate://crates.io/docopt/0.8.1 \
+crate://crates.io/dtoa/0.4.1 \
+crate://crates.io/env_logger/0.4.3 \
+crate://crates.io/error-chain/0.11.0-rc.2 \
+crate://crates.io/filetime/0.1.10 \
+crate://crates.io/flate2/0.2.19 \
+crate://crates.io/fnv/1.0.5 \
+crate://crates.io/foreign-types/0.2.0 \
+crate://crates.io/fs2/0.4.2 \
+crate://crates.io/gcc/0.3.51 \
+crate://crates.io/git2-curl/0.7.0 \
+crate://crates.io/git2/0.6.6 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/globset/0.2.0 \
+crate://crates.io/hamcrest/0.1.1 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/home/0.3.0 \
+crate://crates.io/idna/0.1.4 \
+crate://crates.io/ignore/0.2.2 \
+crate://crates.io/itoa/0.3.1 \
+crate://crates.io/jobserver/0.1.6 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/lazy_static/0.2.8 \
+crate://crates.io/libc/0.2.28 \
+crate://crates.io/libgit2-sys/0.6.12 \
+crate://crates.io/libssh2-sys/0.2.6 \
+crate://crates.io/libz-sys/1.0.16 \
+crate://crates.io/log/0.3.8 \
+crate://crates.io/magenta-sys/0.1.1 \
+crate://crates.io/magenta/0.1.1 \
+crate://crates.io/matches/0.1.6 \
+crate://crates.io/memchr/0.1.11 \
+crate://crates.io/memchr/1.0.1 \
+crate://crates.io/miniz-sys/0.1.9 \
+crate://crates.io/miow/0.2.1 \
+crate://crates.io/net2/0.2.30 \
+crate://crates.io/num-bigint/0.1.40 \
+crate://crates.io/num-complex/0.1.40 \
+crate://crates.io/num-integer/0.1.35 \
+crate://crates.io/num-iter/0.1.34 \
+crate://crates.io/num-rational/0.1.39 \
+crate://crates.io/num-traits/0.1.40 \
+crate://crates.io/num/0.1.40 \
+crate://crates.io/num_cpus/1.6.2 \
+crate://crates.io/openssl-probe/0.1.1 \
+crate://crates.io/openssl-sys/0.9.15 \
+crate://crates.io/openssl/0.9.15 \
+crate://crates.io/percent-encoding/1.0.0 \
+crate://crates.io/pkg-config/0.3.9 \
+crate://crates.io/psapi-sys/0.1.0 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/rand/0.3.16 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex-syntax/0.4.1 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/regex/0.2.2 \
+crate://crates.io/rustc-demangle/0.1.4 \
+crate://crates.io/rustc-serialize/0.3.24 \
+crate://crates.io/same-file/0.1.3 \
+crate://crates.io/scoped-tls/0.1.0 \
+crate://crates.io/scopeguard/0.1.2 \
+crate://crates.io/semver-parser/0.7.0 \
+crate://crates.io/semver/0.7.0 \
+crate://crates.io/serde/1.0.11 \
+crate://crates.io/serde_derive/1.0.11 \
+crate://crates.io/serde_derive_internals/0.15.1 \
+crate://crates.io/serde_ignored/0.0.3 \
+crate://crates.io/serde_json/1.0.2 \
+crate://crates.io/shell-escape/0.1.3 \
+crate://crates.io/socket2/0.2.1 \
+crate://crates.io/strsim/0.6.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/tar/0.4.13 \
+crate://crates.io/tempdir/0.3.5 \
+crate://crates.io/termcolor/0.3.2 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/thread_local/0.3.4 \
+crate://crates.io/toml/0.4.3 \
+crate://crates.io/unicode-bidi/0.3.4 \
+crate://crates.io/unicode-normalization/0.1.5 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/url/1.5.1 \
+crate://crates.io/userenv-sys/0.2.0 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/vcpkg/0.2.2 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/walkdir/1.0.7 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/wincolor/0.1.4 \
+crate://crates.io/ws2_32-sys/0.2.1 \
+"
+
+
+
+# FIXME: update generateme with the real MD5 of the license file
+LIC_FILES_CHKSUM=" \
+file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+SUMMARY = "Cargo, a package manager for Rust."
+HOMEPAGE = "https://crates.io"
+LICENSE = "MIT | Apache-2.0"
+
+# includes this file if it exists but does not fail
+# this is useful for anything you may want to override from
+# what cargo-bitbake generates.
+include cargo-${PV}.inc
+include cargo.inc

recipes-devtools/cargo/cargo_0.25.0.bb

@@ -0,0 +1,167 @@
+# Auto-Generated by cargo-bitbake 0.3.10-pre
+#
+inherit cargo
+
+# If this is git based prefer versioned ones if they exist
+# DEFAULT_PREFERENCE = "-1"
+
+# how to get cargo could be as easy as but default to a git checkout:
+# SRC_URI += "crate://crates.io/cargo/0.25.0"
+SRC_URI += "git://github.com/rust-lang/cargo;protocol=http;branch=rust-1.24.0"
+SRCREV = "8c93e089536467783957fec23b0f2627bb6ce357"
+S = "${WORKDIR}/git"
+CARGO_SRC_DIR=""
+
+# please note if you have entries that do not begin with crate://
+# you must change them to how that package can be fetched
+SRC_URI += " \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.5.3 \
+crate://crates.io/aho-corasick/0.6.4 \
+crate://crates.io/atty/0.2.6 \
+crate://crates.io/backtrace-sys/0.1.16 \
+crate://crates.io/backtrace/0.3.5 \
+crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/bitflags/1.0.1 \
+crate://crates.io/bufstream/0.1.3 \
+crate://crates.io/cc/1.0.4 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/cmake/0.1.29 \
+crate://crates.io/commoncrypto-sys/0.2.0 \
+crate://crates.io/commoncrypto/0.2.0 \
+crate://crates.io/core-foundation-sys/0.4.6 \
+crate://crates.io/core-foundation/0.4.6 \
+crate://crates.io/crossbeam/0.2.12 \
+crate://crates.io/crossbeam/0.3.2 \
+crate://crates.io/crypto-hash/0.3.0 \
+crate://crates.io/curl-sys/0.4.1 \
+crate://crates.io/curl/0.4.11 \
+crate://crates.io/docopt/0.8.3 \
+crate://crates.io/dtoa/0.4.2 \
+crate://crates.io/env_logger/0.4.3 \
+crate://crates.io/failure/0.1.1 \
+crate://crates.io/failure_derive/0.1.1 \
+crate://crates.io/filetime/0.1.15 \
+crate://crates.io/flate2/1.0.1 \
+crate://crates.io/fnv/1.0.6 \
+crate://crates.io/foreign-types-shared/0.1.1 \
+crate://crates.io/foreign-types/0.3.2 \
+crate://crates.io/fs2/0.4.3 \
+crate://crates.io/fuchsia-zircon-sys/0.3.3 \
+crate://crates.io/fuchsia-zircon/0.3.3 \
+crate://crates.io/git2-curl/0.7.0 \
+crate://crates.io/git2/0.6.11 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/globset/0.2.1 \
+crate://crates.io/hamcrest/0.1.1 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/home/0.3.0 \
+crate://crates.io/idna/0.1.4 \
+crate://crates.io/ignore/0.2.2 \
+crate://crates.io/itoa/0.3.4 \
+crate://crates.io/jobserver/0.1.9 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/lazy_static/0.2.11 \
+crate://crates.io/lazy_static/1.0.0 \
+crate://crates.io/libc/0.2.36 \
+crate://crates.io/libgit2-sys/0.6.19 \
+crate://crates.io/libssh2-sys/0.2.6 \
+crate://crates.io/libz-sys/1.0.18 \
+crate://crates.io/log/0.3.9 \
+crate://crates.io/log/0.4.1 \
+crate://crates.io/matches/0.1.6 \
+crate://crates.io/memchr/0.1.11 \
+crate://crates.io/memchr/1.0.2 \
+crate://crates.io/memchr/2.0.1 \
+crate://crates.io/miniz-sys/0.1.10 \
+crate://crates.io/miow/0.2.1 \
+crate://crates.io/net2/0.2.31 \
+crate://crates.io/num-bigint/0.1.43 \
+crate://crates.io/num-complex/0.1.42 \
+crate://crates.io/num-integer/0.1.36 \
+crate://crates.io/num-iter/0.1.35 \
+crate://crates.io/num-rational/0.1.42 \
+crate://crates.io/num-traits/0.1.43 \
+crate://crates.io/num-traits/0.2.0 \
+crate://crates.io/num/0.1.42 \
+crate://crates.io/num_cpus/1.8.0 \
+crate://crates.io/openssl-probe/0.1.2 \
+crate://crates.io/openssl-sys/0.9.26 \
+crate://crates.io/openssl/0.9.24 \
+crate://crates.io/percent-encoding/1.0.1 \
+crate://crates.io/pkg-config/0.3.9 \
+crate://crates.io/psapi-sys/0.1.1 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/rand/0.3.22 \
+crate://crates.io/rand/0.4.2 \
+crate://crates.io/redox_syscall/0.1.37 \
+crate://crates.io/redox_termios/0.1.1 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex-syntax/0.4.2 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/regex/0.2.6 \
+crate://crates.io/remove_dir_all/0.3.0 \
+crate://crates.io/rustc-demangle/0.1.6 \
+crate://crates.io/rustc-serialize/0.3.24 \
+crate://crates.io/same-file/0.1.3 \
+crate://crates.io/schannel/0.1.10 \
+crate://crates.io/scoped-tls/0.1.0 \
+crate://crates.io/scopeguard/0.1.2 \
+crate://crates.io/semver-parser/0.7.0 \
+crate://crates.io/semver/0.8.0 \
+crate://crates.io/serde/1.0.27 \
+crate://crates.io/serde_derive/1.0.27 \
+crate://crates.io/serde_derive_internals/0.19.0 \
+crate://crates.io/serde_ignored/0.0.4 \
+crate://crates.io/serde_json/1.0.9 \
+crate://crates.io/shell-escape/0.1.3 \
+crate://crates.io/socket2/0.3.1 \
+crate://crates.io/strsim/0.6.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/synstructure/0.6.1 \
+crate://crates.io/tar/0.4.14 \
+crate://crates.io/tempdir/0.3.6 \
+crate://crates.io/termcolor/0.3.4 \
+crate://crates.io/termion/1.5.1 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/thread_local/0.3.5 \
+crate://crates.io/toml/0.4.5 \
+crate://crates.io/unicode-bidi/0.3.4 \
+crate://crates.io/unicode-normalization/0.1.5 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/url/1.6.0 \
+crate://crates.io/userenv-sys/0.2.0 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/vcpkg/0.2.2 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/walkdir/1.0.7 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/winapi/0.3.4 \
+crate://crates.io/wincolor/0.1.6 \
+crate://crates.io/ws2_32-sys/0.2.1 \
+"
+
+
+
+# FIXME: update generateme with the real MD5 of the license file
+LIC_FILES_CHKSUM=" \
+file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+SUMMARY = "Cargo, a package manager for Rust."
+HOMEPAGE = "https://crates.io"
+LICENSE = "MIT | Apache-2.0"
+
+# includes this file if it exists but does not fail
+# this is useful for anything you may want to override from
+# what cargo-bitbake generates.
+include cargo-${PV}.inc
+include cargo.inc

recipes-devtools/cargo/cargo_1.34.2.bb

@@ -1,8 +0,0 @@
-require recipes-devtools/rust/rust-source-${PV}.inc
-require recipes-devtools/rust/rust-snapshot-${PV}.inc
-require cargo.inc
-
-LIC_FILES_CHKSUM += " \
-    file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
-    file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
-"

recipes-devtools/cargo/cargo_1.36.0.bb

@@ -1,8 +0,0 @@
-require recipes-devtools/rust/rust-source-${PV}.inc
-require recipes-devtools/rust/rust-snapshot-${PV}.inc
-require cargo.inc
-
-LIC_FILES_CHKSUM += " \
-    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
-    file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
-"

recipes-devtools/cargo/cargo_1.37.0.bb

@@ -1,8 +0,0 @@
-require recipes-devtools/rust/rust-source-${PV}.inc
-require recipes-devtools/rust/rust-snapshot-${PV}.inc
-require cargo.inc
-
-LIC_FILES_CHKSUM += " \
-    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
-    file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
-"

recipes-devtools/cargo/cargo_1.39.0.bb

@@ -1,8 +0,0 @@
-require recipes-devtools/rust/rust-source-${PV}.inc
-require recipes-devtools/rust/rust-snapshot-${PV}.inc
-require cargo.inc
-
-LIC_FILES_CHKSUM += " \
-    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
-    file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
-"

recipes-devtools/cargo/cargo_1.40.0.bb

@@ -1,8 +0,0 @@
-require recipes-devtools/rust/rust-source-${PV}.inc
-require recipes-devtools/rust/rust-snapshot-${PV}.inc
-require cargo.inc
-
-LIC_FILES_CHKSUM += " \
-    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
-    file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
-"

recipes-devtools/cargo/cargo_1.41.0.bb

@@ -1,8 +0,0 @@
-require recipes-devtools/rust/rust-source-${PV}.inc
-require recipes-devtools/rust/rust-snapshot-${PV}.inc
-require cargo.inc
-
-LIC_FILES_CHKSUM += " \
-    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
-    file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \
-"

recipes-devtools/rust/files/rust-1.21.0/0001-Don-t-use-remapped-path-when-loading-modules-and-inc.patch

@@ -0,0 +1,245 @@
+From a0714f06eb1df66a206e1d0fadccf175276b753b Mon Sep 17 00:00:00 2001
+From: Philip Craig <philipjcraig@gmail.com>
+Date: Sat, 30 Sep 2017 16:28:48 +1000
+Subject: [PATCH] Don't use remapped path when loading modules and include
+ files
+
+---
+ src/librustc/ich/impls_syntax.rs              |  1 +
+ src/librustc/session/mod.rs                   |  4 +---
+ src/libsyntax/codemap.rs                      | 14 +++++++++++++-
+ src/libsyntax/ext/expand.rs                   |  6 ++----
+ src/libsyntax/ext/source_util.rs              |  2 +-
+ src/libsyntax/parse/parser.rs                 |  2 +-
+ src/libsyntax_pos/lib.rs                      |  6 ++++++
+ src/test/codegen/remap_path_prefix/aux_mod.rs | 16 ++++++++++++++++
+ src/test/codegen/remap_path_prefix/main.rs    |  7 +++++++
+ 9 files changed, 48 insertions(+), 10 deletions(-)
+ create mode 100644 src/test/codegen/remap_path_prefix/aux_mod.rs
+
+diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs
+index b827284271..489fd9b5b7 100644
+--- a/src/librustc/ich/impls_syntax.rs
++++ b/src/librustc/ich/impls_syntax.rs
+@@ -332,6 +332,7 @@ impl<'a, 'gcx, 'tcx> HashStable<StableHashingContext<'a, 'gcx, 'tcx>> for FileMa
+         let FileMap {
+             ref name,
+             name_was_remapped,
++            path: _,
+             crate_of_origin,
+             // Do not hash the source as it is not encoded
+             src: _,
+diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
+index 7ff9d202c1..619ae81506 100644
+--- a/src/librustc/session/mod.rs
++++ b/src/librustc/session/mod.rs
+@@ -72,8 +72,7 @@ pub struct Session {
+     pub derive_registrar_fn: Cell<Option<ast::NodeId>>,
+     pub default_sysroot: Option<PathBuf>,
+     // The name of the root source file of the crate, in the local file system.
+-    // The path is always expected to be absolute. `None` means that there is no
+-    // source file.
++    // `None` means that there is no source file.
+     pub local_crate_source_file: Option<String>,
+     // The directory the compiler has been executed in plus a flag indicating
+     // if the value stored here has been affected by path remapping.
+@@ -707,7 +706,6 @@ pub fn build_session_(sopts: config::Options,
+ 
+     let file_path_mapping = sopts.file_path_mapping();
+ 
+-    // Make the path absolute, if necessary
+     let local_crate_source_file = local_crate_source_file.map(|path| {
+         file_path_mapping.map_prefix(path.to_string_lossy().into_owned()).0
+     });
+diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
+index 30ae7df935..e8cfa51ee2 100644
+--- a/src/libsyntax/codemap.rs
++++ b/src/libsyntax/codemap.rs
+@@ -162,9 +162,16 @@ impl CodeMap {
+         let start_pos = self.next_start_pos();
+         let mut files = self.files.borrow_mut();
+ 
++        // The path is used to determine the directory for loading submodules and
++        // include files, so it must be before remapping.
++        // Note that filename may not be a valid path, eg it may be `<anon>` etc,
++        // but this is okay because the directory determined by `path.pop()` will
++        // be empty, so the working directory will be used.
++        let path = PathBuf::from(filename.clone());
++
+         let (filename, was_remapped) = self.path_mapping.map_prefix(filename);
+         let filemap =
+-            Rc::new(FileMap::new(filename, was_remapped, src, Pos::from_usize(start_pos)));
++            Rc::new(FileMap::new(filename, was_remapped, path, src, Pos::from_usize(start_pos)));
+ 
+         files.push(filemap.clone());
+ 
+@@ -216,6 +223,7 @@ impl CodeMap {
+         let filemap = Rc::new(FileMap {
+             name: filename,
+             name_was_remapped,
++            path: PathBuf::new(),
+             crate_of_origin,
+             src: None,
+             src_hash,
+@@ -351,6 +359,10 @@ impl CodeMap {
+         self.lookup_char_pos(sp.lo).file.name.to_string()
+     }
+ 
++    pub fn span_to_path(&self, sp: Span) -> PathBuf {
++        self.lookup_char_pos(sp.lo).file.path.clone()
++    }
++
+     pub fn span_to_lines(&self, sp: Span) -> FileLinesResult {
+         debug!("span_to_lines(sp={:?})", sp);
+ 
+diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
+index 171b0a22e9..8db8c83ef4 100644
+--- a/src/libsyntax/ext/expand.rs
++++ b/src/libsyntax/ext/expand.rs
+@@ -35,7 +35,6 @@ use visit::Visitor;
+ 
+ use std::collections::HashMap;
+ use std::mem;
+-use std::path::PathBuf;
+ use std::rc::Rc;
+ 
+ macro_rules! expansions {
+@@ -200,7 +199,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
+         self.cx.crate_root = std_inject::injected_crate_name(&krate);
+         let mut module = ModuleData {
+             mod_path: vec![Ident::from_str(&self.cx.ecfg.crate_name)],
+-            directory: PathBuf::from(self.cx.codemap().span_to_filename(krate.span)),
++            directory: self.cx.codemap().span_to_path(krate.span),
+         };
+         module.directory.pop();
+         self.cx.current_expansion.module = Rc::new(module);
+@@ -902,8 +901,7 @@ impl<'a, 'b> Folder for InvocationCollector<'a, 'b> {
+                         module.directory.push(&*item.ident.name.as_str());
+                     }
+                 } else {
+-                    let mut path =
+-                        PathBuf::from(self.cx.parse_sess.codemap().span_to_filename(inner));
++                    let mut path = self.cx.parse_sess.codemap().span_to_path(inner);
+                     let directory_ownership = match path.file_name().unwrap().to_str() {
+                         Some("mod.rs") => DirectoryOwnership::Owned,
+                         _ => DirectoryOwnership::UnownedViaMod(false),
+diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
+index 95fe41be12..17a18256b3 100644
+--- a/src/libsyntax/ext/source_util.rs
++++ b/src/libsyntax/ext/source_util.rs
+@@ -197,7 +197,7 @@ fn res_rel_file(cx: &mut ExtCtxt, sp: syntax_pos::Span, arg: &Path) -> PathBuf {
+     // after macro expansion (that is, they are unhygienic).
+     if !arg.is_absolute() {
+         let callsite = sp.source_callsite();
+-        let mut path = PathBuf::from(&cx.codemap().span_to_filename(callsite));
++        let mut path = cx.codemap().span_to_path(callsite);
+         path.pop();
+         path.push(arg);
+         path
+diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
+index 90a635fdf4..8c443e8b27 100644
+--- a/src/libsyntax/parse/parser.rs
++++ b/src/libsyntax/parse/parser.rs
+@@ -519,7 +519,7 @@ impl<'a> Parser<'a> {
+         if let Some(directory) = directory {
+             parser.directory = directory;
+         } else if parser.span != syntax_pos::DUMMY_SP {
+-            parser.directory.path = PathBuf::from(sess.codemap().span_to_filename(parser.span));
++            parser.directory.path = sess.codemap().span_to_path(parser.span);
+             parser.directory.path.pop();
+         }
+ 
+diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs
+index d34dcfa3ed..b0db4edc30 100644
+--- a/src/libsyntax_pos/lib.rs
++++ b/src/libsyntax_pos/lib.rs
+@@ -32,6 +32,7 @@ use std::cmp;
+ use std::fmt;
+ use std::hash::Hasher;
+ use std::ops::{Add, Sub};
++use std::path::PathBuf;
+ use std::rc::Rc;
+ 
+ use rustc_data_structures::stable_hasher::StableHasher;
+@@ -441,6 +442,8 @@ pub struct FileMap {
+     pub name: FileName,
+     /// True if the `name` field above has been modified by -Zremap-path-prefix
+     pub name_was_remapped: bool,
++    /// The path of the file that the source came from.
++    pub path: PathBuf,
+     /// Indicates which crate this FileMap was imported from.
+     pub crate_of_origin: u32,
+     /// The complete source code
+@@ -566,6 +569,7 @@ impl Decodable for FileMap {
+             Ok(FileMap {
+                 name,
+                 name_was_remapped,
++                path: PathBuf::new(),
+                 // `crate_of_origin` has to be set by the importer.
+                 // This value matches up with rustc::hir::def_id::INVALID_CRATE.
+                 // That constant is not available here unfortunately :(
+@@ -591,6 +595,7 @@ impl fmt::Debug for FileMap {
+ impl FileMap {
+     pub fn new(name: FileName,
+                name_was_remapped: bool,
++               path: PathBuf,
+                mut src: String,
+                start_pos: BytePos) -> FileMap {
+         remove_bom(&mut src);
+@@ -604,6 +609,7 @@ impl FileMap {
+         FileMap {
+             name,
+             name_was_remapped,
++            path,
+             crate_of_origin: 0,
+             src: Some(Rc::new(src)),
+             src_hash,
+diff --git a/src/test/codegen/remap_path_prefix/aux_mod.rs b/src/test/codegen/remap_path_prefix/aux_mod.rs
+new file mode 100644
+index 0000000000..2a7019957a
+--- /dev/null
++++ b/src/test/codegen/remap_path_prefix/aux_mod.rs
+@@ -0,0 +1,16 @@
++// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
++// file at the top-level directory of this distribution and at
++// http://rust-lang.org/COPYRIGHT.
++//
++// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
++// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
++// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
++// option. This file may not be copied, modified, or distributed
++// except according to those terms.
++
++// ignore-test: this is not a test
++
++#[inline]
++pub fn some_aux_mod_function() -> i32 {
++    1234
++}
+diff --git a/src/test/codegen/remap_path_prefix/main.rs b/src/test/codegen/remap_path_prefix/main.rs
+index eb00c91ba5..c73739bb76 100644
+--- a/src/test/codegen/remap_path_prefix/main.rs
++++ b/src/test/codegen/remap_path_prefix/main.rs
+@@ -16,12 +16,19 @@
+ 
+ extern crate remap_path_prefix_aux;
+ 
++// Here we check that submodules and include files are found using the path without
++// remapping. This test requires that rustc is called with an absolute path.
++mod aux_mod;
++include!("aux_mod.rs");
++
+ // Here we check that the expansion of the file!() macro is mapped.
+ // CHECK: internal constant [34 x i8] c"/the/src/remap_path_prefix/main.rs"
+ pub static FILE_PATH: &'static str = file!();
+ 
+ fn main() {
+     remap_path_prefix_aux::some_aux_function();
++    aux_mod::some_aux_mod_function();
++    some_aux_mod_function();
+ }
+ 
+ // Here we check that local debuginfo is mapped correctly.
+-- 
+2.14.3
+

recipes-devtools/rust/files/rust-1.21.0/0001-librustc-always-allow-unstable-options.patch

@@ -0,0 +1,43 @@
+From 6a82f31d21ac7b85211e580585cc73ab2bdb0bc9 Mon Sep 17 00:00:00 2001
+From: Tyler Hall <tyler.hall@lexmark.com>
+Date: Sun, 29 Oct 2017 16:29:03 -0400
+Subject: [PATCH] librustc: always allow unstable options
+
+---
+ src/librustc/session/config.rs | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
+index 4b41572c1a..97381bc05c 100644
+--- a/src/librustc/session/config.rs
++++ b/src/librustc/session/config.rs
+@@ -1703,8 +1703,6 @@ pub mod nightly_options {
+ 
+     pub fn check_nightly_options(matches: &getopts::Matches, flags: &[RustcOptGroup]) {
+         let has_z_unstable_option = matches.opt_strs("Z").iter().any(|x| *x == "unstable-options");
+-        let really_allows_unstable_options = UnstableFeatures::from_environment()
+-            .is_nightly_build();
+ 
+         for opt in flags.iter() {
+             if opt.stability == OptionStability::Stable {
+@@ -1719,17 +1717,6 @@ pub mod nightly_options {
+                                       the flag `{}`",
+                                      opt.name));
+             }
+-            if really_allows_unstable_options {
+-                continue
+-            }
+-            match opt.stability {
+-                OptionStability::Unstable => {
+-                    let msg = format!("the option `{}` is only accepted on the \
+-                                       nightly compiler", opt.name);
+-                    early_error(ErrorOutputType::default(), &msg);
+-                }
+-                OptionStability::Stable => {}
+-            }
+         }
+     }
+ }
+-- 
+2.14.2
+

recipes-devtools/rust/files/rust-1.24.1/0001-librustc-always-allow-unstable-options.patch

@@ -0,0 +1,43 @@
+From 6a82f31d21ac7b85211e580585cc73ab2bdb0bc9 Mon Sep 17 00:00:00 2001
+From: Tyler Hall <tyler.hall@lexmark.com>
+Date: Sun, 29 Oct 2017 16:29:03 -0400
+Subject: [PATCH] librustc: always allow unstable options
+
+---
+ src/librustc/session/config.rs | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
+index 4b41572c1a..97381bc05c 100644
+--- a/src/librustc/session/config.rs
++++ b/src/librustc/session/config.rs
+@@ -1703,8 +1703,6 @@ pub mod nightly_options {
+ 
+     pub fn check_nightly_options(matches: &getopts::Matches, flags: &[RustcOptGroup]) {
+         let has_z_unstable_option = matches.opt_strs("Z").iter().any(|x| *x == "unstable-options");
+-        let really_allows_unstable_options = UnstableFeatures::from_environment()
+-            .is_nightly_build();
+ 
+         for opt in flags.iter() {
+             if opt.stability == OptionStability::Stable {
+@@ -1719,17 +1717,6 @@ pub mod nightly_options {
+                                       the flag `{}`",
+                                      opt.name));
+             }
+-            if really_allows_unstable_options {
+-                continue
+-            }
+-            match opt.stability {
+-                OptionStability::Unstable => {
+-                    let msg = format!("the option `{}` is only accepted on the \
+-                                       nightly compiler", opt.name);
+-                    early_error(ErrorOutputType::default(), &msg);
+-                }
+-                OptionStability::Stable => {}
+-            }
+         }
+     }
+ }
+-- 
+2.14.2
+

recipes-devtools/rust/libstd-rs.inc

@@ -6,14 +6,11 @@ LICENSE = "MIT | Apache-2.0"
 RUSTLIB_DEP = ""
 inherit cargo
 
-DEPENDS_append_libc-musl = " libunwind"
 # Needed so cargo can find libbacktrace
 RUSTFLAGS += "-L ${STAGING_LIBDIR} -C link-arg=-Wl,-soname,libstd.so"
 
 S = "${RUSTSRC}/src/libstd"
 
-CARGO_BUILD_FLAGS += "--features '${CARGO_FEATURES}'"
-
 do_compile_prepend () {
     export CARGO_TARGET_DIR="${B}"
     # For Rust 1.13.0 and newer
@@ -26,6 +23,6 @@ do_install () {
     # With the incremental build support added in 1.24, the libstd deps directory also includes dependency
     # files that get installed. Those are really only needed to incrementally rebuild the libstd library
     # itself and don't need to be installed.
-    rm -f ${B}/${TARGET_SYS}/${BUILD_DIR}/deps/*.d
-    cp ${B}/${TARGET_SYS}/${BUILD_DIR}/deps/* ${D}${rustlibdir}
+    rm -f ${B}/${TARGET_SYS}/release/deps/*.d
+    cp ${B}/${TARGET_SYS}/release/deps/* ${D}${rustlibdir}
 }

recipes-devtools/rust/libstd-rs_1.20.0.bb

@@ -0,0 +1,139 @@
+require rust-source-${PV}.inc
+require libstd-rs.inc
+
+LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=12922f5565a22267bd82aaeb6d3548e5"
+
+# Don't use jemalloc as it doesn't work for many targets.
+# https://github.com/rust-lang/rust/pull/37392
+CARGO_BUILD_FLAGS += "--features 'panic-unwind'"
+
+# These are taken from src/libstd/Cargo.toml via cargo-bitbake
+SRC_URI += " \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.5.3 \
+crate://crates.io/aho-corasick/0.6.3 \
+crate://crates.io/ansi_term/0.9.0 \
+crate://crates.io/atty/0.2.2 \
+crate://crates.io/backtrace-sys/0.1.11 \
+crate://crates.io/backtrace/0.3.2 \
+crate://crates.io/bitflags/0.8.2 \
+crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/bufstream/0.1.3 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/clap/2.25.0 \
+crate://crates.io/cmake/0.1.24 \
+crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/curl-sys/0.3.14 \
+crate://crates.io/curl/0.4.7 \
+crate://crates.io/dbghelp-sys/0.2.0 \
+crate://crates.io/diff/0.1.10 \
+crate://crates.io/docopt/0.8.1 \
+crate://crates.io/dtoa/0.4.1 \
+crate://crates.io/env_logger/0.4.3 \
+crate://crates.io/error-chain/0.10.0 \
+crate://crates.io/error-chain/0.11.0-rc.2 \
+crate://crates.io/filetime/0.1.10 \
+crate://crates.io/flate2/0.2.19 \
+crate://crates.io/foreign-types/0.2.0 \
+crate://crates.io/fs2/0.4.2 \
+crate://crates.io/gcc/0.3.51 \
+crate://crates.io/getopts/0.2.14 \
+crate://crates.io/git2-curl/0.7.0 \
+crate://crates.io/git2/0.6.6 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/hamcrest/0.1.1 \
+crate://crates.io/handlebars/0.26.2 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/idna/0.1.2 \
+crate://crates.io/itoa/0.3.1 \
+crate://crates.io/jobserver/0.1.6 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/lazy_static/0.2.8 \
+crate://crates.io/libc/0.2.26 \
+crate://crates.io/libgit2-sys/0.6.12 \
+crate://crates.io/libssh2-sys/0.2.6 \
+crate://crates.io/libz-sys/1.0.16 \
+crate://crates.io/log/0.3.8 \
+crate://crates.io/lzma-sys/0.1.7 \
+crate://crates.io/matches/0.1.6 \
+crate://crates.io/mdbook/0.0.22 \
+crate://crates.io/memchr/0.1.11 \
+crate://crates.io/memchr/1.0.1 \
+crate://crates.io/miniz-sys/0.1.9 \
+crate://crates.io/miow/0.2.1 \
+crate://crates.io/net2/0.2.29 \
+crate://crates.io/num-bigint/0.1.39 \
+crate://crates.io/num-complex/0.1.38 \
+crate://crates.io/num-integer/0.1.34 \
+crate://crates.io/num-iter/0.1.33 \
+crate://crates.io/num-rational/0.1.38 \
+crate://crates.io/num-traits/0.1.39 \
+crate://crates.io/num/0.1.39 \
+crate://crates.io/num_cpus/1.6.2 \
+crate://crates.io/open/1.2.0 \
+crate://crates.io/openssl-probe/0.1.1 \
+crate://crates.io/openssl-sys/0.9.15 \
+crate://crates.io/openssl/0.9.15 \
+crate://crates.io/owning_ref/0.3.3 \
+crate://crates.io/percent-encoding/1.0.0 \
+crate://crates.io/pest/0.3.3 \
+crate://crates.io/pkg-config/0.3.9 \
+crate://crates.io/psapi-sys/0.1.0 \
+crate://crates.io/pulldown-cmark/0.0.14 \
+crate://crates.io/quick-error/1.2.0 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/rand/0.3.15 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex-syntax/0.4.1 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/regex/0.2.2 \
+crate://crates.io/rls-data/0.7.0 \
+crate://crates.io/rls-span/0.4.0 \
+crate://crates.io/rustc-demangle/0.1.4 \
+crate://crates.io/rustc-serialize/0.3.24 \
+crate://crates.io/same-file/0.1.3 \
+crate://crates.io/scoped-tls/0.1.0 \
+crate://crates.io/semver-parser/0.7.0 \
+crate://crates.io/semver/0.7.0 \
+crate://crates.io/serde/1.0.10 \
+crate://crates.io/serde_derive/1.0.10 \
+crate://crates.io/serde_derive_internals/0.15.1 \
+crate://crates.io/serde_ignored/0.0.3 \
+crate://crates.io/serde_json/1.0.2 \
+crate://crates.io/shell-escape/0.1.3 \
+crate://crates.io/socket2/0.2.1 \
+crate://crates.io/stable_deref_trait/1.0.0 \
+crate://crates.io/strsim/0.6.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/tar/0.4.13 \
+crate://crates.io/tempdir/0.3.5 \
+crate://crates.io/term_size/0.3.0 \
+crate://crates.io/termcolor/0.3.2 \
+crate://crates.io/textwrap/0.6.0 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/thread_local/0.3.4 \
+crate://crates.io/toml/0.1.30 \
+crate://crates.io/toml/0.4.2 \
+crate://crates.io/unicode-bidi/0.3.4 \
+crate://crates.io/unicode-normalization/0.1.5 \
+crate://crates.io/unicode-segmentation/1.1.0 \
+crate://crates.io/unicode-width/0.1.4 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/url/1.5.1 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/vcpkg/0.2.2 \
+crate://crates.io/vec_map/0.8.0 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/walkdir/1.0.7 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/wincolor/0.1.4 \
+crate://crates.io/ws2_32-sys/0.2.1 \
+crate://crates.io/xattr/0.1.11 \
+crate://crates.io/xz2/0.1.3 \
+crate://crates.io/yaml-rust/0.3.5 \
+"

recipes-devtools/rust/libstd-rs_1.21.0.bb

@@ -0,0 +1,170 @@
+require rust-source-${PV}.inc
+require libstd-rs.inc
+
+LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=c709a09d1b062d9a908e3631c1e1cdf5"
+
+# Don't use jemalloc as it doesn't work for many targets.
+# https://github.com/rust-lang/rust/pull/37392
+CARGO_BUILD_FLAGS += "--features 'panic-unwind'"
+
+# These are taken from src/libstd/Cargo.toml via cargo-bitbake
+SRC_URI += " \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.5.3 \
+crate://crates.io/aho-corasick/0.6.3 \
+crate://crates.io/ansi_term/0.9.0 \
+crate://crates.io/ar/0.3.0 \
+crate://crates.io/atty/0.2.2 \
+crate://crates.io/backtrace-sys/0.1.12 \
+crate://crates.io/backtrace/0.3.2 \
+crate://crates.io/bitflags/0.7.0 \
+crate://crates.io/bitflags/0.8.2 \
+crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/bufstream/0.1.3 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/clap/2.26.0 \
+crate://crates.io/cmake/0.1.24 \
+crate://crates.io/core-foundation-sys/0.4.4 \
+crate://crates.io/core-foundation/0.4.4 \
+crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/curl-sys/0.3.14 \
+crate://crates.io/curl/0.4.8 \
+crate://crates.io/dbghelp-sys/0.2.0 \
+crate://crates.io/derive-new/0.3.0 \
+crate://crates.io/diff/0.1.10 \
+crate://crates.io/docopt/0.8.1 \
+crate://crates.io/dtoa/0.4.1 \
+crate://crates.io/enum_primitive/0.1.1 \
+crate://crates.io/env_logger/0.3.5 \
+crate://crates.io/env_logger/0.4.3 \
+crate://crates.io/error-chain/0.10.0 \
+crate://crates.io/error-chain/0.11.0-rc.2 \
+crate://crates.io/filetime/0.1.10 \
+crate://crates.io/flate2/0.2.19 \
+crate://crates.io/fnv/1.0.5 \
+crate://crates.io/foreign-types/0.2.0 \
+crate://crates.io/fs2/0.4.2 \
+crate://crates.io/futures/0.1.14 \
+crate://crates.io/gcc/0.3.51 \
+crate://crates.io/getopts/0.2.14 \
+crate://crates.io/git2-curl/0.7.0 \
+crate://crates.io/git2/0.6.6 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/globset/0.2.0 \
+crate://crates.io/hamcrest/0.1.1 \
+crate://crates.io/handlebars/0.26.2 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/home/0.3.0 \
+crate://crates.io/idna/0.1.4 \
+crate://crates.io/ignore/0.2.2 \
+crate://crates.io/itoa/0.3.1 \
+crate://crates.io/jobserver/0.1.6 \
+crate://crates.io/jsonrpc-core/7.1.0 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/languageserver-types/0.12.0 \
+crate://crates.io/lazy_static/0.2.8 \
+crate://crates.io/libc/0.2.29 \
+crate://crates.io/libgit2-sys/0.6.12 \
+crate://crates.io/libssh2-sys/0.2.6 \
+crate://crates.io/libz-sys/1.0.16 \
+crate://crates.io/log/0.3.8 \
+crate://crates.io/lzma-sys/0.1.8 \
+crate://crates.io/matches/0.1.6 \
+crate://crates.io/mdbook/0.0.22 \
+crate://crates.io/memchr/0.1.11 \
+crate://crates.io/memchr/1.0.1 \
+crate://crates.io/miniz-sys/0.1.9 \
+crate://crates.io/miow/0.2.1 \
+crate://crates.io/net2/0.2.31 \
+crate://crates.io/num-bigint/0.1.40 \
+crate://crates.io/num-complex/0.1.40 \
+crate://crates.io/num-integer/0.1.35 \
+crate://crates.io/num-iter/0.1.34 \
+crate://crates.io/num-rational/0.1.39 \
+crate://crates.io/num-traits/0.1.40 \
+crate://crates.io/num/0.1.40 \
+crate://crates.io/num_cpus/1.6.2 \
+crate://crates.io/open/1.2.0 \
+crate://crates.io/openssl-probe/0.1.1 \
+crate://crates.io/openssl-sys/0.9.17 \
+crate://crates.io/openssl/0.9.17 \
+crate://crates.io/owning_ref/0.3.3 \
+crate://crates.io/percent-encoding/1.0.0 \
+crate://crates.io/pest/0.3.3 \
+crate://crates.io/pkg-config/0.3.9 \
+crate://crates.io/psapi-sys/0.1.0 \
+crate://crates.io/pulldown-cmark/0.0.14 \
+crate://crates.io/quick-error/1.2.0 \
+crate://crates.io/quote/0.2.3 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/racer/2.0.10 \
+crate://crates.io/rand/0.3.15 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex-syntax/0.4.1 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/regex/0.2.2 \
+crate://crates.io/rls-analysis/0.6.5 \
+crate://crates.io/rls-data/0.10.0 \
+crate://crates.io/rls-rustc/0.1.0 \
+crate://crates.io/rls-span/0.4.0 \
+crate://crates.io/rls-vfs/0.4.4 \
+crate://crates.io/rustc-demangle/0.1.5 \
+crate://crates.io/rustc-serialize/0.3.24 \
+crate://crates.io/rustfmt-nightly/0.2.2 \
+crate://crates.io/same-file/0.1.3 \
+crate://crates.io/scoped-tls/0.1.0 \
+crate://crates.io/scopeguard/0.1.2 \
+crate://crates.io/semver-parser/0.7.0 \
+crate://crates.io/semver/0.7.0 \
+crate://crates.io/serde/1.0.11 \
+crate://crates.io/serde_derive/1.0.11 \
+crate://crates.io/serde_derive_internals/0.15.1 \
+crate://crates.io/serde_ignored/0.0.3 \
+crate://crates.io/serde_json/1.0.2 \
+crate://crates.io/shell-escape/0.1.3 \
+crate://crates.io/socket2/0.2.2 \
+crate://crates.io/stable_deref_trait/1.0.0 \
+crate://crates.io/strings/0.1.0 \
+crate://crates.io/strsim/0.6.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/syn/0.8.7 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/syntex_errors/0.52.0 \
+crate://crates.io/syntex_pos/0.52.0 \
+crate://crates.io/syntex_syntax/0.52.0 \
+crate://crates.io/tar/0.4.13 \
+crate://crates.io/tempdir/0.3.5 \
+crate://crates.io/term/0.4.6 \
+crate://crates.io/term_size/0.3.0 \
+crate://crates.io/termcolor/0.3.2 \
+crate://crates.io/textwrap/0.7.0 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/thread_local/0.3.4 \
+crate://crates.io/toml/0.2.1 \
+crate://crates.io/toml/0.4.5 \
+crate://crates.io/typed-arena/1.3.0 \
+crate://crates.io/unicode-bidi/0.3.4 \
+crate://crates.io/unicode-normalization/0.1.5 \
+crate://crates.io/unicode-segmentation/1.2.0 \
+crate://crates.io/unicode-width/0.1.4 \
+crate://crates.io/unicode-xid/0.0.3 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/url/1.5.1 \
+crate://crates.io/url_serde/0.2.0 \
+crate://crates.io/userenv-sys/0.2.0 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/vcpkg/0.2.2 \
+crate://crates.io/vec_map/0.8.0 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/walkdir/1.0.7 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/wincolor/0.1.4 \
+crate://crates.io/ws2_32-sys/0.2.1 \
+crate://crates.io/xattr/0.1.11 \
+crate://crates.io/xz2/0.1.3 \
+crate://crates.io/yaml-rust/0.3.5 \
+"

recipes-devtools/rust/libstd-rs_1.24.1.bb

@@ -0,0 +1,235 @@
+require rust-source-${PV}.inc
+require libstd-rs.inc
+
+LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=c709a09d1b062d9a908e3631c1e1cdf5"
+
+# Don't use jemalloc as it doesn't work for many targets.
+# https://github.com/rust-lang/rust/pull/37392
+CARGO_BUILD_FLAGS += "--features 'panic-unwind'"
+
+# These are taken from src/libstd/Cargo.toml via cargo-bitbake
+SRC_URI += " \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.5.3 \
+crate://crates.io/aho-corasick/0.6.4 \
+crate://crates.io/ansi_term/0.10.2 \
+crate://crates.io/ar/0.3.1 \
+crate://crates.io/atty/0.2.3 \
+crate://crates.io/backtrace-sys/0.1.16 \
+crate://crates.io/backtrace/0.3.4 \
+crate://crates.io/bitflags/0.7.0 \
+crate://crates.io/bitflags/0.9.1 \
+crate://crates.io/bitflags/1.0.1 \
+crate://crates.io/bufstream/0.1.3 \
+crate://crates.io/byteorder/1.2.1 \
+crate://crates.io/cargo_metadata/0.2.3 \
+crate://crates.io/cargo_metadata/0.4.0 \
+crate://crates.io/cc/1.0.3 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/clap/2.29.0 \
+crate://crates.io/cmake/0.1.29 \
+crate://crates.io/coco/0.1.1 \
+crate://crates.io/commoncrypto-sys/0.2.0 \
+crate://crates.io/commoncrypto/0.2.0 \
+crate://crates.io/compiletest_rs/0.3.3 \
+crate://crates.io/core-foundation-sys/0.4.6 \
+crate://crates.io/core-foundation/0.4.6 \
+crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/crossbeam/0.3.0 \
+crate://crates.io/crypto-hash/0.3.0 \
+crate://crates.io/cssparser-macros/0.3.0 \
+crate://crates.io/cssparser/0.13.7 \
+crate://crates.io/curl-sys/0.3.15 \
+crate://crates.io/curl/0.4.8 \
+crate://crates.io/dbghelp-sys/0.2.0 \
+crate://crates.io/debug_unreachable/0.1.1 \
+crate://crates.io/derive-new/0.5.0 \
+crate://crates.io/diff/0.1.11 \
+crate://crates.io/docopt/0.8.1 \
+crate://crates.io/dtoa/0.4.2 \
+crate://crates.io/duct/0.8.2 \
+crate://crates.io/either/1.4.0 \
+crate://crates.io/endian-type/0.1.2 \
+crate://crates.io/enum_primitive/0.1.1 \
+crate://crates.io/env_logger/0.3.5 \
+crate://crates.io/env_logger/0.4.3 \
+crate://crates.io/error-chain/0.11.0 \
+crate://crates.io/error-chain/0.8.1 \
+crate://crates.io/failure/0.1.1 \
+crate://crates.io/failure_derive/0.1.1 \
+crate://crates.io/filetime/0.1.14 \
+crate://crates.io/flate2/1.0.1 \
+crate://crates.io/fnv/1.0.6 \
+crate://crates.io/foreign-types-shared/0.1.1 \
+crate://crates.io/foreign-types/0.3.2 \
+crate://crates.io/fs2/0.4.2 \
+crate://crates.io/fuchsia-zircon-sys/0.3.2 \
+crate://crates.io/fuchsia-zircon/0.3.2 \
+crate://crates.io/futf/0.1.3 \
+crate://crates.io/futures/0.1.17 \
+crate://crates.io/getopts/0.2.15 \
+crate://crates.io/git2-curl/0.7.0 \
+crate://crates.io/git2/0.6.10 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/globset/0.2.1 \
+crate://crates.io/hamcrest/0.1.1 \
+crate://crates.io/handlebars/0.29.1 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/home/0.3.0 \
+crate://crates.io/html-diff/0.0.5 \
+crate://crates.io/html5ever/0.20.0 \
+crate://crates.io/idna/0.1.4 \
+crate://crates.io/if_chain/0.1.2 \
+crate://crates.io/ignore/0.2.2 \
+crate://crates.io/itertools/0.6.5 \
+crate://crates.io/itoa/0.3.4 \
+crate://crates.io/jobserver/0.1.8 \
+crate://crates.io/json/0.11.12 \
+crate://crates.io/jsonrpc-core/8.0.1 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/kuchiki/0.6.0 \
+crate://crates.io/languageserver-types/0.16.0 \
+crate://crates.io/lazy_static/0.2.11 \
+crate://crates.io/lazy_static/1.0.0 \
+crate://crates.io/lazycell/0.5.1 \
+crate://crates.io/libc/0.2.34 \
+crate://crates.io/libgit2-sys/0.6.18 \
+crate://crates.io/libssh2-sys/0.2.6 \
+crate://crates.io/libz-sys/1.0.18 \
+crate://crates.io/log/0.3.9 \
+crate://crates.io/log/0.4.1 \
+crate://crates.io/log_settings/0.1.1 \
+crate://crates.io/lzma-sys/0.1.9 \
+crate://crates.io/mac/0.1.1 \
+crate://crates.io/markup5ever/0.5.0 \
+crate://crates.io/matches/0.1.6 \
+crate://crates.io/mdbook/0.0.26 \
+crate://crates.io/memchr/0.1.11 \
+crate://crates.io/memchr/1.0.2 \
+crate://crates.io/memchr/2.0.1 \
+crate://crates.io/miniz-sys/0.1.10 \
+crate://crates.io/miow/0.2.1 \
+crate://crates.io/net2/0.2.31 \
+crate://crates.io/nibble_vec/0.0.3 \
+crate://crates.io/nix/0.8.1 \
+crate://crates.io/num-bigint/0.1.41 \
+crate://crates.io/num-complex/0.1.41 \
+crate://crates.io/num-integer/0.1.35 \
+crate://crates.io/num-iter/0.1.34 \
+crate://crates.io/num-rational/0.1.40 \
+crate://crates.io/num-traits/0.1.41 \
+crate://crates.io/num/0.1.41 \
+crate://crates.io/num_cpus/1.7.0 \
+crate://crates.io/open/1.2.1 \
+crate://crates.io/openssl-probe/0.1.2 \
+crate://crates.io/openssl-sys/0.9.23 \
+crate://crates.io/openssl/0.9.23 \
+crate://crates.io/os_pipe/0.5.1 \
+crate://crates.io/owning_ref/0.3.3 \
+crate://crates.io/parking_lot/0.5.3 \
+crate://crates.io/parking_lot_core/0.2.9 \
+crate://crates.io/percent-encoding/1.0.1 \
+crate://crates.io/pest/0.3.3 \
+crate://crates.io/phf/0.7.21 \
+crate://crates.io/phf_codegen/0.7.21 \
+crate://crates.io/phf_generator/0.7.21 \
+crate://crates.io/phf_shared/0.7.21 \
+crate://crates.io/pkg-config/0.3.9 \
+crate://crates.io/precomputed-hash/0.1.1 \
+crate://crates.io/procedural-masquerade/0.1.5 \
+crate://crates.io/psapi-sys/0.1.1 \
+crate://crates.io/pulldown-cmark/0.0.15 \
+crate://crates.io/pulldown-cmark/0.1.0 \
+crate://crates.io/quick-error/1.2.1 \
+crate://crates.io/quine-mc_cluskey/0.2.4 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/racer/2.0.12 \
+crate://crates.io/radix_trie/0.1.2 \
+crate://crates.io/rand/0.3.19 \
+crate://crates.io/rayon-core/1.3.0 \
+crate://crates.io/rayon/0.9.0 \
+crate://crates.io/redox_syscall/0.1.32 \
+crate://crates.io/redox_termios/0.1.1 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex-syntax/0.4.1 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/regex/0.2.3 \
+crate://crates.io/rls-analysis/0.10.0 \
+crate://crates.io/rls-data/0.14.0 \
+crate://crates.io/rls-rustc/0.1.1 \
+crate://crates.io/rls-span/0.4.0 \
+crate://crates.io/rls-vfs/0.4.4 \
+crate://crates.io/rustc-demangle/0.1.5 \
+crate://crates.io/rustc-serialize/0.3.24 \
+crate://crates.io/same-file/0.1.3 \
+crate://crates.io/scoped-tls/0.1.0 \
+crate://crates.io/scopeguard/0.1.2 \
+crate://crates.io/scopeguard/0.3.3 \
+crate://crates.io/selectors/0.18.0 \
+crate://crates.io/semver-parser/0.7.0 \
+crate://crates.io/semver/0.6.0 \
+crate://crates.io/semver/0.8.0 \
+crate://crates.io/serde/1.0.25 \
+crate://crates.io/serde_derive/1.0.25 \
+crate://crates.io/serde_derive_internals/0.18.1 \
+crate://crates.io/serde_ignored/0.0.4 \
+crate://crates.io/serde_json/1.0.8 \
+crate://crates.io/shared_child/0.2.1 \
+crate://crates.io/shell-escape/0.1.3 \
+crate://crates.io/siphasher/0.2.2 \
+crate://crates.io/smallvec/0.3.3 \
+crate://crates.io/smallvec/0.6.0 \
+crate://crates.io/socket2/0.2.4 \
+crate://crates.io/stable_deref_trait/1.0.0 \
+crate://crates.io/string_cache/0.6.2 \
+crate://crates.io/string_cache_codegen/0.4.0 \
+crate://crates.io/string_cache_shared/0.3.0 \
+crate://crates.io/strsim/0.6.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/synstructure/0.6.1 \
+crate://crates.io/syntex_errors/0.52.0 \
+crate://crates.io/syntex_pos/0.52.0 \
+crate://crates.io/syntex_syntax/0.52.0 \
+crate://crates.io/tar/0.4.14 \
+crate://crates.io/tempdir/0.3.5 \
+crate://crates.io/tendril/0.4.0 \
+crate://crates.io/term/0.4.6 \
+crate://crates.io/termcolor/0.3.3 \
+crate://crates.io/termion/1.5.1 \
+crate://crates.io/textwrap/0.9.0 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/thread_local/0.3.5 \
+crate://crates.io/time/0.1.39 \
+crate://crates.io/toml/0.2.1 \
+crate://crates.io/toml/0.4.5 \
+crate://crates.io/unicode-bidi/0.3.4 \
+crate://crates.io/unicode-normalization/0.1.5 \
+crate://crates.io/unicode-segmentation/1.2.0 \
+crate://crates.io/unicode-width/0.1.4 \
+crate://crates.io/unicode-xid/0.0.3 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unreachable/0.1.1 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/url/1.6.0 \
+crate://crates.io/url_serde/0.2.0 \
+crate://crates.io/userenv-sys/0.2.0 \
+crate://crates.io/utf-8/0.7.1 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/utf8-ranges/1.0.0 \
+crate://crates.io/vcpkg/0.2.2 \
+crate://crates.io/vec_map/0.8.0 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/walkdir/1.0.7 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/winapi/0.3.4 \
+crate://crates.io/wincolor/0.1.4 \
+crate://crates.io/ws2_32-sys/0.2.1 \
+crate://crates.io/xattr/0.1.11 \
+crate://crates.io/xz2/0.1.3 \
+crate://crates.io/yaml-rust/0.3.5 \
+"

recipes-devtools/rust/libstd-rs_1.34.2.bb

@@ -1,8 +0,0 @@
-require rust-source-${PV}.inc
-require libstd-rs.inc
-
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
-
-CARGO_FEATURES ?= "panic-unwind backtrace"
-
-CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"

recipes-devtools/rust/libstd-rs_1.36.0.bb

@@ -1,8 +0,0 @@
-require rust-source-${PV}.inc
-require libstd-rs.inc
-
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
-
-CARGO_FEATURES ?= "panic-unwind backtrace"
-
-CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"

recipes-devtools/rust/libstd-rs_1.37.0.bb

@@ -1,8 +0,0 @@
-require rust-source-${PV}.inc
-require libstd-rs.inc
-
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
-
-CARGO_FEATURES ?= "panic-unwind backtrace"
-
-CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"

recipes-devtools/rust/libstd-rs_1.39.0.bb

@@ -1,8 +0,0 @@
-require rust-source-${PV}.inc
-require libstd-rs.inc
-
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
-
-CARGO_FEATURES ?= "panic-unwind backtrace"
-
-CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"

recipes-devtools/rust/libstd-rs_1.40.0.bb

@@ -1,8 +0,0 @@
-require rust-source-${PV}.inc
-require libstd-rs.inc
-
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
-
-CARGO_FEATURES ?= "panic-unwind backtrace"
-
-CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"

recipes-devtools/rust/libstd-rs_1.41.0.bb

@@ -1,8 +0,0 @@
-require rust-source-${PV}.inc
-require libstd-rs.inc
-
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"
-
-CARGO_FEATURES ?= "panic-unwind backtrace"
-
-CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"

recipes-devtools/rust/rust-cross.inc

@@ -1,21 +1,6 @@
 require rust.inc
 inherit cross
 
-python do_rust_gen_targets () {
-    wd = d.getVar('WORKDIR') + '/targets/'
-    # It is important 'TARGET' is last here so that it overrides our less
-    # informed choices for BUILD & HOST if TARGET happens to be the same as
-    # either of them.
-    for thing in ['BUILD', 'HOST', 'TARGET']:
-        bb.debug(1, "rust_gen_target for " + thing)
-        features = ""
-        cpu = "generic"
-        if thing is "TARGET":
-            features = d.getVar('TARGET_LLVM_FEATURES') or ""
-            cpu = d.getVar('TARGET_LLVM_CPU')
-        rust_gen_target(d, thing, wd, features, cpu)
-}
-
 # Otherwise we'll depend on what we provide
 INHIBIT_DEFAULT_RUST_DEPS = "1"
 
@@ -47,9 +32,6 @@ BUILD_POST_LINK_ARGS_append = " -Wl,-rpath=../../lib"
 # We need the same thing for the calls to the compiler when building the runtime crap
 TARGET_CC_ARCH_append = " --sysroot=${STAGING_DIR_TARGET}"
 
-do_rust_setup_snapshot () {
-}
-
 do_configure () {
 }
 

recipes-devtools/rust/rust-cross_1.20.0.bb

@@ -1,3 +1,3 @@
 require rust-cross.inc
 require rust-source-${PV}.inc
-
+require rust-snapshot-${PV}.inc

recipes-devtools/rust/rust-cross_1.21.0.bb

@@ -1,3 +1,3 @@
 require rust-cross.inc
 require rust-source-${PV}.inc
-
+require rust-snapshot-${PV}.inc

recipes-devtools/rust/rust-cross_1.24.1.bb

@@ -1,3 +1,4 @@
 require rust-cross.inc
 require rust-source-${PV}.inc
+require rust-snapshot-${PV}.inc
 

recipes-devtools/rust/rust-cross_1.39.0.bb

@@ -1,2 +0,0 @@
-require rust-cross.inc
-require rust-source-${PV}.inc

recipes-devtools/rust/rust-cross_1.40.0.bb

@@ -1,2 +0,0 @@
-require rust-cross.inc
-require rust-source-${PV}.inc

recipes-devtools/rust/rust-cross_1.41.0.bb

@@ -1,2 +0,0 @@
-require rust-cross.inc
-require rust-source-${PV}.inc

recipes-devtools/rust/rust-llvm-ncsa.inc

@@ -1,5 +0,0 @@
-LICENSE = "NCSA"
-
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
-
-require rust-llvm.inc

recipes-devtools/rust/rust-llvm.inc

@@ -1,62 +1,65 @@
 SUMMARY = "LLVM compiler framework (packaged with rust)"
-LICENSE ?= "Apache-2.0-with-LLVM-exception"
+LICENSE = "NCSA"
 
-SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch"
+S = "${RUSTSRC}/src/llvm"
 
-S = "${RUSTSRC}/src/llvm-project/llvm"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
 
-LIC_FILES_CHKSUM ?= "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
-
-inherit cmake python3native
-
-DEPENDS += "ninja-native rust-llvm-native"
-
-ARM_INSTRUCTION_SET_armv5 = "arm"
-ARM_INSTRUCTION_SET_armv4t = "arm"
-
-LLVM_RELEASE = "6.0"
-LLVM_DIR = "llvm${LLVM_RELEASE}"
+inherit cmake pythonnative
 
 EXTRA_OECMAKE = " \
-    -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;PowerPC;Mips' \
+    -DLLVM_ENABLE_ASSERTIONS=OFF \
     -DLLVM_BUILD_DOCS=OFF \
     -DLLVM_ENABLE_TERMINFO=OFF \
     -DLLVM_ENABLE_ZLIB=OFF \
-    -DLLVM_ENABLE_LIBXML2=OFF \
     -DLLVM_ENABLE_FFI=OFF \
     -DLLVM_INSTALL_UTILS=ON \
+    -DLLVM_BUILD_TOOLS=ON \
     -DLLVM_BUILD_EXAMPLES=OFF \
     -DLLVM_INCLUDE_EXAMPLES=OFF \
     -DLLVM_BUILD_TESTS=OFF \
     -DLLVM_INCLUDE_TESTS=OFF \
     -DLLVM_TARGET_ARCH=${TARGET_ARCH} \
-    -DCMAKE_INSTALL_PREFIX:PATH=${libdir}/llvm-rust \
-"
-EXTRA_OECMAKE_append_class-target = "\
-    -DCMAKE_CROSSCOMPILING:BOOL=ON \
-    -DLLVM_BUILD_TOOLS=OFF \
-    -DLLVM_TABLEGEN=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-tblgen \
-    -DLLVM_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config \
 "
 
 # The debug symbols are huge here (>2GB) so suppress them since they
 # provide almost no value. If you really need them then override this
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
+do_compile_prepend_class-target() {
+    # Fix paths in llvm-config
+    sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp
+
+    # Fix the hardcoded libdir in llvm-config
+    sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp
+}
+
 do_install_append_class-target() {
     # Disable checks on the native tools, since these should came from the native recipe
     sed -i -e 's/\(.*APPEND.*_IMPORT_CHECK_FILES_FOR_.*{_IMPORT_PREFIX}\/bin\/.*\)/#\1/' ${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake
 }
 
+SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_sysroot_preprocess"
+SYSROOT_PREPROCESS_FUNCS_append_class-native = " llvm_native_sysroot_preprocess"
+
+llvm_sysroot_preprocess() {
+    install -d ${SYSROOT_DESTDIR}${bindir}
+    cp ${B}/NATIVE/bin/llvm-config ${SYSROOT_DESTDIR}/${bindir} || bbfatal "missing llvm-config"
+    cp ${B}/NATIVE/bin/llvm-tblgen ${SYSROOT_DESTDIR}/${bindir} || bbfatal "missing llvm-tblgen"
+}
+
+llvm_native_sysroot_preprocess() {
+    sysroot_stage_dir ${D}${STAGING_DIR_NATIVE}/usr/libexec ${SYSROOT_DESTDIR}${bindir}
+}
+
 PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liblto"
 
 # Add the extra locations to avoid the complaints about unpackaged files
-FILES_${PN}-bugpointpasses = "${libdir}/llvm-rust/lib/BugpointPasses.so"
-FILES_${PN}-llvmhello = "${libdir}/llvm-rust/lib/LLVMHello.so"
-FILES_${PN}-liblto = "${libdir}/llvm-rust/lib/libLTO.so.*"
-FILES_${PN}-staticdev =+ "${libdir}/llvm-rust/*/*.a"
-FILES_${PN} += "${libdir}/libLLVM*.so.* ${libdir}/llvm-rust/lib/*.so.* ${libdir}/llvm-rust/bin"
-FILES_${PN}-dev += "${datadir}/llvm ${libdir}/llvm-rust/lib/*.so ${libdir}/llvm-rust/include ${libdir}/llvm-rust/share ${libdir}/llvm-rust/lib/cmake"
+FILES_${PN} += "${libdir}/libLLVM*.so"
+FILES_${PN}-dev += "${datadir}/llvm"
+FILES_${PN}-bugpointpasses = "${libdir}/BugpointPasses.so"
+FILES_${PN}-llvmhello = "${libdir}/LLVMHello.so"
+FILES_${PN}-liblto = "${libdir}/libLTO.so"
 
 BBCLASSEXTEND = "native"

recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch

@@ -1,32 +0,0 @@
-From 7111770e8290082530d920e120995bf81431b0aa Mon Sep 17 00:00:00 2001
-From: Martin Kelly <mkelly@xevo.com>
-Date: Fri, 19 May 2017 00:22:57 -0700
-Subject: [PATCH 12/18] llvm: allow env override of exe path
-
-When using a native llvm-config from inside a sysroot, we need llvm-config to
-return the libraries, include directories, etc. from inside the sysroot rather
-than from the native sysroot. Thus provide an env override for calling
-llvm-config from a target sysroot.
-
-Signed-off-by: Martin Kelly <mkelly@xevo.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/llvm-config/llvm-config.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/tools/llvm-config/llvm-config.cpp
-+++ b/tools/llvm-config/llvm-config.cpp
-@@ -226,6 +226,13 @@ Typical components:\n\
- 
- /// Compute the path to the main executable.
- std::string GetExecutablePath(const char *Argv0) {
-+  // Hack for Yocto: we need to override the root path when we are using
-+  // llvm-config from within a target sysroot.
-+  const char *Sysroot = std::getenv("YOCTO_ALTERNATE_EXE_PATH");
-+  if (Sysroot != nullptr) {
-+    return Sysroot;
-+  }
-+
-   // This just needs to be some symbol in the binary; C++ doesn't
-   // allow taking the address of ::main however.
-   void *P = (void *)(intptr_t)GetExecutablePath;

recipes-devtools/rust/rust-llvm_1.20.0.bb

@@ -1,7 +1,7 @@
 require rust-source-${PV}.inc
 require rust-llvm.inc
 
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e5251771"
 
 do_install_prepend () {
 	# the install does a sed on this without installing the file

recipes-devtools/rust/rust-llvm_1.21.0.bb

@@ -1,7 +1,7 @@
 require rust-source-${PV}.inc
 require rust-llvm.inc
 
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e5251771"
 
 do_install_prepend () {
 	# the install does a sed on this without installing the file

recipes-devtools/rust/rust-llvm_1.24.1.bb

@@ -1,7 +1,7 @@
 require rust-source-${PV}.inc
 require rust-llvm.inc
 
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e5251771"
 
 do_install_prepend () {
 	# the install does a sed on this without installing the file

recipes-devtools/rust/rust-llvm_1.34.2.bb

@@ -1,16 +0,0 @@
-require rust-source-${PV}.inc
-require rust-llvm-ncsa.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
-
-do_install_prepend () {
-	# the install does a sed on this without installing the file
-	# we don't need it for anything
-	mkdir -p "${D}/usr/share/llvm/cmake"
-	touch "${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake"
-}
-
-do_install_append () {
-	# we don't need any of this stuff to build Rust
-	rm -rf "${D}/usr/lib/cmake"
-}

recipes-devtools/rust/rust-llvm_1.36.0.bb

@@ -1,16 +0,0 @@
-require rust-source-${PV}.inc
-require rust-llvm-ncsa.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
-
-do_install_prepend () {
-	# the install does a sed on this without installing the file
-	# we don't need it for anything
-	mkdir -p "${D}/usr/share/llvm/cmake"
-	touch "${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake"
-}
-
-do_install_append () {
-	# we don't need any of this stuff to build Rust
-	rm -rf "${D}/usr/lib/cmake"
-}

recipes-devtools/rust/rust-llvm_1.37.0.bb

@@ -1,16 +0,0 @@
-require rust-source-${PV}.inc
-require rust-llvm-ncsa.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
-
-do_install_prepend () {
-	# the install does a sed on this without installing the file
-	# we don't need it for anything
-	mkdir -p "${D}/usr/share/llvm/cmake"
-	touch "${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake"
-}
-
-do_install_append () {
-	# we don't need any of this stuff to build Rust
-	rm -rf "${D}/usr/lib/cmake"
-}

recipes-devtools/rust/rust-snapshot-1.20.0.inc

@@ -0,0 +1,26 @@
+# Specifics for Rust 1.20.0
+
+## This is information on the rust-snapshot (binary) used to build our current release.
+## snapshot info is taken from rust/src/stage0.txt
+## TODO: find a way to add additional SRC_URIs based on the contents of an
+##       earlier SRC_URI.
+RS_VERSION = "1.19.0"
+
+RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${RUST_BUILD_SYS}"
+RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${RUST_BUILD_SYS}"
+CARGO_VERSION = "0.20.0"
+CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${RUST_BUILD_SYS}"
+
+SRC_URI += " \
+	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.gz;name=rust-std-snapshot;subdir=rust-snapshot-components \
+	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.gz;name=rustc-snapshot;subdir=rust-snapshot-components \
+	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot;subdir=rust-snapshot-components \
+	"
+
+# These are x86_64-unknown-linux-gnu hashes, how can we add more?
+SRC_URI[rustc-snapshot.md5sum] = "e5077b80cc953a1fb9c767aa039d5984"
+SRC_URI[rustc-snapshot.sha256sum] = "4c8df3088d17c8e06bf58d453d39bd521487defcefc8193203b80f0fb797d6fe"
+SRC_URI[rust-std-snapshot.md5sum] = "2bff47764df01c99f349908601c10478"
+SRC_URI[rust-std-snapshot.sha256sum] = "5905803e8a127f656bf253978692f0d6cf6c9206c527e4d6d7e981980618d1b6"
+SRC_URI[cargo-snapshot.md5sum] = "63aa861b029eec9f559f4fb5a10c287d"
+SRC_URI[cargo-snapshot.sha256sum] = "a677d13b01d00ad13edf75c7d1b484421c7fc09338bf9ed6d456b4685bb42ed1"

recipes-devtools/rust/rust-snapshot-1.21.0.inc

@@ -0,0 +1,26 @@
+# Specifics for Rust 1.21.0
+
+## This is information on the rust-snapshot (binary) used to build our current release.
+## snapshot info is taken from rust/src/stage0.txt
+## TODO: find a way to add additional SRC_URIs based on the contents of an
+##       earlier SRC_URI.
+RS_VERSION = "1.20.0"
+
+RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${RUST_BUILD_SYS}"
+RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${RUST_BUILD_SYS}"
+CARGO_VERSION = "0.21.0"
+CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${RUST_BUILD_SYS}"
+
+SRC_URI += " \
+	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.gz;name=rust-std-snapshot;subdir=rust-snapshot-components \
+	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.gz;name=rustc-snapshot;subdir=rust-snapshot-components \
+	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot;subdir=rust-snapshot-components \
+	"
+
+# These are x86_64-unknown-linux-gnu hashes, how can we add more?
+SRC_URI[rustc-snapshot.md5sum] = "c6276176ec6061b61ae73617a64bceb0"
+SRC_URI[rustc-snapshot.sha256sum] = "000e776431718a32b5d40c4aa6e09b3425f0b71dea8c95e718d29b8c0f5b35d3"
+SRC_URI[rust-std-snapshot.md5sum] = "8c0f7355b66830517a51a2bd6f530327"
+SRC_URI[rust-std-snapshot.sha256sum] = "a1b3e13b9d6f9aa713783145cb83070b1dabbe17349043b3528031d7712ca929"
+SRC_URI[cargo-snapshot.md5sum] = "0e5389d2e38a14933dda77db8172cb1f"
+SRC_URI[cargo-snapshot.sha256sum] = "caccf4ab039c806a9e6fdc7fe389cc88fb771e28e30d93c07a5c56ef845cdf57"

recipes-devtools/rust/rust-snapshot-1.24.1.inc

@@ -0,0 +1,26 @@
+# Specifics for Rust 1.24.0
+
+## This is information on the rust-snapshot (binary) used to build our current release.
+## snapshot info is taken from rust/src/stage0.txt
+## TODO: find a way to add additional SRC_URIs based on the contents of an
+##       earlier SRC_URI.
+RS_VERSION = "1.23.0"
+
+RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${RUST_BUILD_SYS}"
+RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${RUST_BUILD_SYS}"
+CARGO_VERSION = "0.24.0"
+CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${RUST_BUILD_SYS}"
+
+SRC_URI += " \
+	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.gz;name=rust-std-snapshot;subdir=rust-snapshot-components \
+	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.gz;name=rustc-snapshot;subdir=rust-snapshot-components \
+	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot;subdir=rust-snapshot-components \
+	"
+
+# These are x86_64-unknown-linux-gnu hashes, how can we add more?
+SRC_URI[rustc-snapshot.md5sum] = "068fc6566772c4ce165cc547151f514c"
+SRC_URI[rustc-snapshot.sha256sum] = "27b124fd0d94c082978ff81e45f7b7c37e91d64714587829bf828d64d76524ee"
+SRC_URI[rust-std-snapshot.md5sum] = "f9f89caf41e3f9c092118272ceb5bf6b"
+SRC_URI[rust-std-snapshot.sha256sum] = "83c7351bdc4326caf785c208cff86682825dad4a89ccee705fa05f55ce7bd25b"
+SRC_URI[cargo-snapshot.md5sum] = "830041cfc8627d3f7187954993449cf9"
+SRC_URI[cargo-snapshot.sha256sum] = "ff8a454104aba20426ea898ed7515ec5da7de07d11733cdda17462455beb76e8"

recipes-devtools/rust/rust-snapshot-1.34.2.inc

@@ -1,24 +0,0 @@
-## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.txt
-## TODO: find a way to add additional SRC_URIs based on the contents of an
-##       earlier SRC_URI.
-RS_VERSION = "1.33.0"
-
-RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-CARGO_VERSION = "0.34.0"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-
-SRC_URI += " \
-	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.gz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.gz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	"
-
-# TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rustc-snapshot-x86_64.md5sum] = "c1ec989c1965dce754dda1e54274a68c"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "54a342f718b712d8a17fd7878ebd37d22a82ebc70b59c421168cd4153fd04c2b"
-SRC_URI[rust-std-snapshot-x86_64.md5sum] = "d573c5bd3a965c973734c1606968a91e"
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "661c2ba717ae1502f002b4c6e7aeb8941685c7ea8fe7ac26ed9ede26f615b7af"
-SRC_URI[cargo-snapshot-x86_64.md5sum] = "de0e635afa9bf495cefecea476bfce36"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "4795ae5ca3bb8c7c83ca338676bb02b670efa1eb474e346284b629dc872bcce8"

recipes-devtools/rust/rust-snapshot-1.36.0.inc

@@ -1,24 +0,0 @@
-## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.txt
-## TODO: find a way to add additional SRC_URIs based on the contents of an
-##       earlier SRC_URI.
-RS_VERSION = "1.35.0"
-
-RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-CARGO_VERSION = "0.36.0"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-
-SRC_URI += " \
-	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	"
-
-# TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rustc-snapshot-x86_64.md5sum] = "47ea78f6b3f68e30f24b9c94e465d6bd"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "5d6dc216ba429ddf3a1657e70f3e5e380549b546fe56de897677a11d72aa4e07"
-SRC_URI[rust-std-snapshot-x86_64.md5sum] = "348ec23ca8e47fc65079bc80e63cca5f"
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "ccff05d0e2d88499505b10f8e33e8b1645df057f918edc81f8acb0fcee9f90b2"
-SRC_URI[cargo-snapshot-x86_64.md5sum] = "93a375e771f3d9b3a139e612dd4730ee"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "ab5a6ff1947463dbd2477ca5dac2012494dae821112098ae0c54add652adfdc3"

recipes-devtools/rust/rust-snapshot-1.37.0.inc

@@ -1,24 +0,0 @@
-## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.txt
-## TODO: find a way to add additional SRC_URIs based on the contents of an
-##       earlier SRC_URI.
-RS_VERSION = "1.36.0"
-
-RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-CARGO_VERSION = "0.37.0"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-
-SRC_URI += " \
-	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	"
-
-# TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rustc-snapshot-x86_64.md5sum] = "ec27794c94cc1df1a0a69f7244a09176"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "fff0158da6f5af2a89936dc3e0c361077c06c2983eb310615e02f81ebbde1416"
-SRC_URI[rust-std-snapshot-x86_64.md5sum] = "b71a6fd6f44527c3bf09584e89ad8958"
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "ce8e12684b568a8a4f7d346a743383429849cf3f028f5712ad3d3e31590c8db3"
-SRC_URI[cargo-snapshot-x86_64.md5sum] = "8c661276a0da7a1aa48affbe33b347e6"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67"

recipes-devtools/rust/rust-snapshot-1.39.0.inc

@@ -1,24 +0,0 @@
-## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.txt
-## TODO: find a way to add additional SRC_URIs based on the contents of an
-##       earlier SRC_URI.
-RS_VERSION = "1.38.0"
-
-RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-CARGO_VERSION = "0.39.0"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-
-SRC_URI += " \
-	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	"
-
-# TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rustc-snapshot-x86_64.md5sum] = "53278262a3996982cd68730db7cb1efd"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "0fedde3406cf3367ceb00f493698e6bfc3264bd7f7253c85de7a042b45f873fa"
-SRC_URI[rust-std-snapshot-x86_64.md5sum] = "0d32b76359613f73671acd13ea57b7ea"
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "51b334337804baeff7524e5496d396f254894d7529860d236975e9ed8fcca371"
-SRC_URI[cargo-snapshot-x86_64.md5sum] = "7274cfe12905fe8ea6edbe131d3f6637"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "80bcb1368ce98d13cb371df89cbbed9007fb98843f34d07f2abd2c03b8f2747a"

recipes-devtools/rust/rust-snapshot-1.40.0.inc

@@ -1,24 +0,0 @@
-## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.txt
-## TODO: find a way to add additional SRC_URIs based on the contents of an
-##       earlier SRC_URI.
-RS_VERSION = "1.39.0"
-
-RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-CARGO_VERSION = "0.40.0"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-
-SRC_URI += " \
-	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	"
-
-# TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rustc-snapshot-x86_64.md5sum] = "aa10585498675e44be219d3644c15853"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "5b2a435a4c034615d70cfc383abe9924cbd1ffd4669caa55ce6539f22ed979ed"
-SRC_URI[rust-std-snapshot-x86_64.md5sum] = "d8b8e6f1a5a255d22b9f86c97a65049f"
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "b629952ec9e3e750137d7b8a922de145c97c1dc372dd616e86e4e501da13910b"
-SRC_URI[cargo-snapshot-x86_64.md5sum] = "a51643b8980bcaefa9043715a8e9a2ba"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "7b9ba52c252964724f49aab49e42bec62fca929297ef058412c7e727b0794620"

recipes-devtools/rust/rust-snapshot-1.41.0.inc

@@ -1,24 +0,0 @@
-## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.txt
-## TODO: find a way to add additional SRC_URIs based on the contents of an
-##       earlier SRC_URI.
-RS_VERSION = "1.40.0"
-
-RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-CARGO_VERSION = "0.41.0"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
-
-SRC_URI += " \
-	https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
-	"
-
-# TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rustc-snapshot-x86_64.md5sum] = "5c62bca8ce4beb9b15e42fb8b9690935"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111"
-SRC_URI[rust-std-snapshot-x86_64.md5sum] = "2f926b4eda6449079665045becff623d"
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "5a0b14a51f51b0194f70a2023749d9cb49c3b2e11f0d4c8232960b91fad336ac"
-SRC_URI[cargo-snapshot-x86_64.md5sum] = "8ea9f8b849d44abf2abf9180f90cc4b6"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c"

recipes-devtools/rust/rust-source-1.20.0.inc

@@ -0,0 +1,14 @@
+# Specifics for Rust 1.20.0
+
+SRC_URI += "\
+	https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust \
+    "
+SRC_URI[rust.md5sum] = "1d3c5d25d8e6215e7d0b6d4d4c9835b9"
+SRC_URI[rust.sha256sum] = "2aa4875ff4472c6e35262bbb9052cb2623da3dae6084a858cc59d36f33f18214"
+
+# later versions of rust change the directory that they unextract to
+RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
+# set this as our default
+S = "${RUSTSRC}"
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=12922f5565a22267bd82aaeb6d3548e5"

recipes-devtools/rust/rust-source-1.21.0.inc

@@ -0,0 +1,14 @@
+# Specifics for Rust 1.21.0
+
+SRC_URI += "\
+	https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust \
+    "
+SRC_URI[rust.md5sum] = "bc494706b764276613064aad52922f53"
+SRC_URI[rust.sha256sum] = "1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa"
+
+# later versions of rust change the directory that they unextract to
+RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
+# set this as our default
+S = "${RUSTSRC}"
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c709a09d1b062d9a908e3631c1e1cdf5"

recipes-devtools/rust/rust-source-1.24.1.inc

@@ -0,0 +1,18 @@
+# Specifics for Rust 1.24.1
+
+SRC_URI += " \
+	https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust \
+"
+
+SRC_URI[md5sum] = "50639bf359e658fcd713787d5898628d"
+SRC_URI[sha256sum] = "3ea53d45e8d2e9a41afb3340cf54b9745f845b552d802d607707cf04450761ef"
+SRC_URI[rust.md5sum] = "50639bf359e658fcd713787d5898628d"
+SRC_URI[rust.sha256sum] = "3ea53d45e8d2e9a41afb3340cf54b9745f845b552d802d607707cf04450761ef"
+
+
+# later versions of rust change the directory that they unextract to
+RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
+# set this as our default
+S = "${RUSTSRC}"
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c709a09d1b062d9a908e3631c1e1cdf5"

recipes-devtools/rust/rust-source-1.34.2.inc

@@ -1,11 +0,0 @@
-SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust"
-
-SRC_URI[rust.md5sum] = "7c85e6a60dda740295f7e004a1fb15e1"
-SRC_URI[rust.sha256sum] = "c69a4a85a1c464368597df8878cb9e1121aae93e215616d45ad7d23af3052f56"
-
-# later versions of rust change the directory that they unextract to
-RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
-# set this as our default
-S = "${RUSTSRC}"
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

recipes-devtools/rust/rust-source-1.36.0.inc

@@ -1,11 +0,0 @@
-SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-
-SRC_URI[rust.md5sum] = "78ffc0b029aaed216b45c3fe24747d46"
-SRC_URI[rust.sha256sum] = "f51645b9f787af4a5d94db17f6af39db0c55980ed24fe366cad55b57900f8f2d"
-
-# later versions of rust change the directory that they unextract to
-RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
-# set this as our default
-S = "${RUSTSRC}"
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

recipes-devtools/rust/rust-source-1.37.0.inc

@@ -1,11 +0,0 @@
-SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-
-SRC_URI[rust.md5sum] = "ee6300b1d7e5767115492915c4c0d8ef"
-SRC_URI[rust.sha256sum] = "10abffac50a729cf74cef6dd03193a2f4647541bd19ee9281be9e5b12ca8cdfd"
-
-# later versions of rust change the directory that they unextract to
-RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
-# set this as our default
-S = "${RUSTSRC}"
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

recipes-devtools/rust/rust-source-1.39.0.inc

@@ -1,11 +0,0 @@
-SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-
-SRC_URI[rust.md5sum] = "ee76b165cd95ef420765bfb568adb450"
-SRC_URI[rust.sha256sum] = "4b0dbb356070687a606034f71dc032b783bbf8b5d3f9fff39f2c1fbc4f171c29"
-
-# later versions of rust change the directory that they unextract to
-RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
-# set this as our default
-S = "${RUSTSRC}"
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

recipes-devtools/rust/rust-source-1.40.0.inc

@@ -1,11 +0,0 @@
-SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-
-SRC_URI[rust.md5sum] = "1725f67a1d92ab843a71fbbefef06db9"
-SRC_URI[rust.sha256sum] = "6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace"
-
-# later versions of rust change the directory that they unextract to
-RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
-# set this as our default
-S = "${RUSTSRC}"
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

recipes-devtools/rust/rust-source-1.41.0.inc

@@ -1,11 +0,0 @@
-SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
-
-SRC_URI[rust.md5sum] = "e8c9d1d39ceb0dd43ee0100d0f019da4"
-SRC_URI[rust.sha256sum] = "38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f"
-
-# later versions of rust change the directory that they unextract to
-RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
-# set this as our default
-S = "${RUSTSRC}"
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0"

recipes-devtools/rust/rust.inc

@@ -6,24 +6,13 @@ LICENSE = "MIT | Apache-2.0"
 inherit rust
 inherit cargo_common
 
-DEPENDS += "file-native python3-native"
-DEPENDS_append_class-native = " rust-llvm-native"
+DEPENDS += "file-native python-native"
 
 # We generate local targets, and need to be able to locate them
 export RUST_TARGET_PATH="${WORKDIR}/targets/"
 
 export FORCE_CRATE_HASH="${BB_TASKHASH}"
 
-export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config"
-export YOCTO_ALTERNATE_MULTILIB_NAME = "/${BASELIB}"
-
-# We don't want to use bitbakes vendoring because the rust sources do their
-# own vendoring.
-CARGO_DISABLE_BITBAKE_VENDORING = "1"
-
-# We can't use RUST_BUILD_SYS here because that may be "musl" if
-# TCLIBC="musl". Snapshots are always -unknown-linux-gnu
-SNAPSHOT_BUILD_SYS = "${BUILD_ARCH}-unknown-linux-gnu"
 setup_cargo_environment () {
     # The first step is to build bootstrap and some early stage tools,
     # these are build for the same target as the snapshot, e.g.
@@ -31,8 +20,8 @@ setup_cargo_environment () {
     # Later stages are build for the native target (i.e. target.x86_64-linux)
     cargo_common_do_configure
 
-    printf '[target.%s]\n' "${SNAPSHOT_BUILD_SYS}" >> ${CARGO_HOME}/config
-    printf "linker = '%s'\n" "${RUST_BUILD_CCLD}" >> ${CARGO_HOME}/config
+    echo "[target.${RUST_BUILD_SYS}]" >> ${CARGO_HOME}/config
+    echo "linker = '${RUST_TARGET_CCLD}'" >> ${CARGO_HOME}/config
 }
 
 # Right now this is focused on arm-specific tune features.
@@ -47,9 +36,6 @@ def llvm_features_from_tune(d):
         return []
     feat = frozenset(feat.split())
 
-    mach_overrides = d.getVar('MACHINEOVERRIDES')
-    mach_overrides = frozenset(mach_overrides.split(':'))
-
     if 'vfpv4' in feat:
         f.append("+vfp4")
     if 'vfpv3' in feat:
@@ -73,19 +59,18 @@ def llvm_features_from_tune(d):
         f.append("+mips32r2")
 
     v7=frozenset(['armv7a', 'armv7r', 'armv7m', 'armv7ve'])
-    if (not mach_overrides.isdisjoint(v7)) or (not feat.isdisjoint(v7)):
+    if not feat.isdisjoint(v7):
         f.append("+v7")
-    if ('armv6' in mach_overrides) or ('armv6' in feat):
+    if 'armv6' in feat:
         f.append("+v6")
 
     if 'dsp' in feat:
         f.append("+dsp")
 
-    if 'thumb' in feat:
-        if d.getVar('ARM_THUMB_OPT') is "thumb":
-            if (not mach_overrides.isdisjoint(v7)) or (not feat.isdisjoint(v7)):
-                f.append("+thumb2")
-            f.append("+thumb-mode")
+    if d.getVar('ARM_THUMB_OPT') is "thumb":
+        if not feat.isdisjoint(v7):
+            f.append("+thumb2")
+        f.append("+thumb-mode")
 
     if 'cortexa5' in feat:
         f.append("+a5")
@@ -154,39 +139,39 @@ TARGET_C_INT_WIDTH[arm] = "32"
 MAX_ATOMIC_WIDTH[arm] = "64"
 FEATURES[arm] = "+v6,+vfp2"
 
-## aarch64-unknown-linux-{gnu, musl}
+## aarch64-unknown-linux-gnu
 DATA_LAYOUT[aarch64] = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-LLVM_TARGET[aarch64] = "${RUST_TARGET_SYS}"
+LLVM_TARGET[aarch64] = "aarch64-unknown-linux-gnu"
 TARGET_ENDIAN[aarch64] = "little"
 TARGET_POINTER_WIDTH[aarch64] = "64"
-TARGET_C_INT_WIDTH[aarch64] = "32"
+TARGET_C_INT_WIDTH[aarch64] = "64"
 MAX_ATOMIC_WIDTH[aarch64] = "128"
 
-## x86_64-unknown-linux-{gnu, musl}
+## x86_64-unknown-linux-gnu
 DATA_LAYOUT[x86_64] = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-LLVM_TARGET[x86_64] = "${RUST_TARGET_SYS}"
+LLVM_TARGET[x86_64] = "x86_64-unknown-linux-gnu"
 TARGET_ENDIAN[x86_64] = "little"
 TARGET_POINTER_WIDTH[x86_64] = "64"
-TARGET_C_INT_WIDTH[x86_64] = "32"
+TARGET_C_INT_WIDTH[x86_64] = "64"
 MAX_ATOMIC_WIDTH[x86_64] = "64"
 
-## i686-unknown-linux-{gnu, musl}
+## i686-unknown-linux-gnu
 DATA_LAYOUT[i686] = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128"
-LLVM_TARGET[i686] = "${RUST_TARGET_SYS}"
+LLVM_TARGET[i686] = "i686-unknown-linux-gnu"
 TARGET_ENDIAN[i686] = "little"
 TARGET_POINTER_WIDTH[i686] = "32"
 TARGET_C_INT_WIDTH[i686] = "32"
 MAX_ATOMIC_WIDTH[i686] = "64"
 
-## XXX: a bit of a hack so qemux86 builds, clone of i686-unknown-linux-{gnu, musl} above
+## XXX: a bit of a hack so qemux86 builds, clone of i686-unknown-linux-gnu above
 DATA_LAYOUT[i586] = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128"
-LLVM_TARGET[i586] = "${RUST_TARGET_SYS}"
+LLVM_TARGET[i586] = "i586-unknown-linux-gnu"
 TARGET_ENDIAN[i586] = "little"
 TARGET_POINTER_WIDTH[i586] = "32"
 TARGET_C_INT_WIDTH[i586] = "32"
 MAX_ATOMIC_WIDTH[i586] = "64"
 
-## mips-unknown-linux-{gnu, musl}
+## mips-unknown-linux-gnu
 DATA_LAYOUT[mips] = "E-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"
 LLVM_TARGET[mips] = "${RUST_TARGET_SYS}"
 TARGET_ENDIAN[mips] = "big"
@@ -194,7 +179,7 @@ TARGET_POINTER_WIDTH[mips] = "32"
 TARGET_C_INT_WIDTH[mips] = "32"
 MAX_ATOMIC_WIDTH[mips] = "32"
 
-## mipsel-unknown-linux-{gnu, musl}
+## mipsel-unknown-linux-gnu
 DATA_LAYOUT[mipsel] = "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64"
 LLVM_TARGET[mipsel] = "${RUST_TARGET_SYS}"
 TARGET_ENDIAN[mipsel] = "little"
@@ -202,46 +187,6 @@ TARGET_POINTER_WIDTH[mipsel] = "32"
 TARGET_C_INT_WIDTH[mipsel] = "32"
 MAX_ATOMIC_WIDTH[mipsel] = "32"
 
-## mips64-unknown-linux-{gnu, musl}
-DATA_LAYOUT[mips64] = "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128"
-LLVM_TARGET[mips64] = "${RUST_TARGET_SYS}"
-TARGET_ENDIAN[mips64] = "big"
-TARGET_POINTER_WIDTH[mips64] = "64"
-TARGET_C_INT_WIDTH[mips64] = "64"
-MAX_ATOMIC_WIDTH[mips64] = "64"
-
-## mips64el-unknown-linux-{gnu, musl}
-DATA_LAYOUT[mips64el] = "e-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128"
-LLVM_TARGET[mips64el] = "${RUST_TARGET_SYS}"
-TARGET_ENDIAN[mips64el] = "little"
-TARGET_POINTER_WIDTH[mips64el] = "64"
-TARGET_C_INT_WIDTH[mips64el] = "64"
-MAX_ATOMIC_WIDTH[mips64el] = "64"
-
-## powerpc-unknown-linux-{gnu, musl}
-DATA_LAYOUT[powerpc] = "E-m:e-p:32:32-i64:64-n32"
-LLVM_TARGET[powerpc] = "${RUST_TARGET_SYS}"
-TARGET_ENDIAN[powerpc] = "big"
-TARGET_POINTER_WIDTH[powerpc] = "32"
-TARGET_C_INT_WIDTH[powerpc] = "32"
-MAX_ATOMIC_WIDTH[powerpc] = "32"
-
-## riscv32-unknown-linux-{gnu, musl}
-DATA_LAYOUT[riscv32] = "e-m:e-p:64:64-i64:64-i128:128-n64-S128"
-LLVM_TARGET[riscv32] = "${RUST_TARGET_SYS}"
-TARGET_ENDIAN[riscv32] = "little"
-TARGET_POINTER_WIDTH[riscv32] = "32"
-TARGET_C_INT_WIDTH[riscv32] = "32"
-MAX_ATOMIC_WIDTH[riscv32] = "32"
-
-## riscv64-unknown-linux-{gnu, musl}
-DATA_LAYOUT[riscv64] = "e-m:e-p:64:64-i64:64-i128:128-n64-S128"
-LLVM_TARGET[riscv64] = "${RUST_TARGET_SYS}"
-TARGET_ENDIAN[riscv64] = "little"
-TARGET_POINTER_WIDTH[riscv64] = "64"
-TARGET_C_INT_WIDTH[riscv64] = "64"
-MAX_ATOMIC_WIDTH[riscv64] = "64"
-
 def arch_for(d, thing):
     return d.getVar('{}_ARCH'.format(thing))
 
@@ -258,8 +203,6 @@ def arch_to_rust_target_arch(arch):
         return "x86"
     elif arch == "mipsel":
         return "mips"
-    elif arch == "mip64sel":
-        return "mips64"
     else:
         return arch
 
@@ -274,9 +217,6 @@ def llvm_cpu(d):
     trans['x86-64'] = "x86-64"
     trans['i686'] = "i686"
     trans['i586'] = "i586"
-    trans['powerpc'] = "powerpc"
-    trans['mips64'] = "mips64"
-    trans['mips64el'] = "mips64"
 
     if target in ["mips", "mipsel"]:
         feat = frozenset(d.getVar('TUNE_FEATURES').split())
@@ -299,13 +239,18 @@ TARGET_LLVM_FEATURES = "${@llvm_features(d)}"
 # (original) target.
 TARGET_LLVM_FEATURES_class-native = "${@','.join(llvm_features_from_cc_arch(d))}"
 
-def rust_gen_target(d, thing, wd, features, cpu):
+def rust_gen_target(d, thing, wd):
     import json
     from distutils.version import LooseVersion
     arch = arch_for(d, thing)
     sys = sys_for(d, thing)
     prefix = prefix_for(d, thing)
 
+    features = ""
+    cpu = "generic"
+    if thing is "TARGET":
+        features = d.getVar('TARGET_LLVM_FEATURES') or ""
+        cpu = d.getVar('TARGET_LLVM_CPU')
     features = features or d.getVarFlag('FEATURES', arch) or ""
     features = features.strip()
 
@@ -319,10 +264,7 @@ def rust_gen_target(d, thing, wd, features, cpu):
     tspec['target-endian'] = d.getVarFlag('TARGET_ENDIAN', arch)
     tspec['arch'] = arch_to_rust_target_arch(arch)
     tspec['os'] = "linux"
-    if "musl" in tspec['llvm-target']:
-        tspec['env'] = "musl"
-    else:
-        tspec['env'] = "gnu"
+    tspec['env'] = "gnu"
     tspec['vendor'] = "unknown"
     tspec['target-family'] = "unix"
     tspec['linker'] = "{}{}gcc".format(d.getVar('CCACHE'), prefix)
@@ -350,14 +292,20 @@ def rust_gen_target(d, thing, wd, features, cpu):
     with open(wd + sys + '.json', 'w') as f:
         json.dump(tspec, f, indent=4)
 
+
 python do_rust_gen_targets () {
     wd = d.getVar('WORKDIR') + '/targets/'
-    rust_gen_target(d, 'BUILD', wd, "", "generic")
+    # It is important 'TARGET' is last here so that it overrides our less
+    # informed choices for BUILD & HOST if TARGET happens to be the same as
+    # either of them.
+    for thing in ['BUILD', 'HOST', 'TARGET']:
+        bb.debug(1, "rust_gen_target for " + thing)
+        rust_gen_target(d, thing, wd)
 }
-
 addtask rust_gen_targets after do_patch before do_compile
 do_rust_gen_targets[dirs] += "${WORKDIR}/targets"
 
+
 do_rust_setup_snapshot () {
     for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do
         "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig
@@ -374,7 +322,6 @@ do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot"
 
 python do_configure() {
     import json
-    from distutils.version import LooseVersion
     try:
         import configparser
     except ImportError:
@@ -392,29 +339,20 @@ python do_configure() {
     target_section = "target.{}".format(d.getVar('TARGET_SYS', True))
     config.add_section(target_section)
 
-    llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}")
+    llvm_config = d.expand("${STAGING_DIR_NATIVE}${bindir_native}/llvm-config")
     config.set(target_section, "llvm-config", e(llvm_config))
 
     config.set(target_section, "cxx", e(d.expand("${RUST_TARGET_CXX}")))
     config.set(target_section, "cc", e(d.expand("${RUST_TARGET_CC}")))
 
-    # If we don't do this rust-native will compile it's own llvm for BUILD.
-    # [target.${BUILD_ARCH}-unknown-linux-gnu]
-    target_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS', True))
-    config.add_section(target_section)
-
-    config.set(target_section, "llvm-config", e(llvm_config))
-
-    config.set(target_section, "cxx", e(d.expand("${RUST_BUILD_CXX}")))
-    config.set(target_section, "cc", e(d.expand("${RUST_BUILD_CC}")))
-
     # [rust]
     config.add_section("rust")
     config.set("rust", "rpath", e(True))
     config.set("rust", "channel", e("stable"))
 
-    if LooseVersion(d.getVar("PV")) < LooseVersion("1.32.0"):
-        config.set("rust", "use-jemalloc", e(False))
+    # Don't use jemalloc as it doesn't work for many targets.
+    # https://github.com/rust-lang/rust/pull/37392
+    config.set("rust", "use-jemalloc", e(False))
 
     # Whether or not to optimize the compiler and standard library
     config.set("rust", "optimize", e(True))
@@ -430,17 +368,13 @@ python do_configure() {
     cargo = d.expand("${WORKDIR}/rust-snapshot/bin/cargo")
     config.set("build", "cargo", e(cargo))
 
-    config.set("build", "vendor", e(True))
-
     targets = [d.getVar("TARGET_SYS", True)]
     config.set("build", "target", e(targets))
 
     hosts = [d.getVar("HOST_SYS", True)]
     config.set("build", "host", e(targets))
 
-    # We can't use BUILD_SYS since that is something the rust snapshot knows
-    # nothing about when trying to build some stage0 tools (like fabricate)
-    config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS", True)))
+    config.set("build", "build", e(d.getVar("BUILD_SYS", True)))
 
     with open("config.toml", "w") as f:
         config.write(f)
@@ -463,22 +397,25 @@ rust_runx () {
 
     oe_cargo_fix_env
 
-    python3 src/bootstrap/bootstrap.py "$@" --verbose
+    python src/bootstrap/bootstrap.py "$@" --verbose
 }
 
+
 do_compile () {
     rust_runx build
-    rust_runx dist
 }
 
-rust_do_install () {
-    # Only install compiler generated for the HOST_SYS. There will be
-    # one for SNAPSHOT_BUILD_SYS as well.
-    local installer=build/tmp/dist/rustc-${PV}-${HOST_SYS}/install.sh
-    ${installer} --destdir="${D}" --prefix="${prefix}" --disable-ldconfig
 
-    installer=build/tmp/dist/rust-std-${PV}-${HOST_SYS}/install.sh
-    ${installer} --destdir="${D}" --prefix="${prefix}" --disable-ldconfig
+rust_do_dist_install () {
+    rust_runx dist
+
+    for installer in "build/tmp/dist/rustc"*"/install.sh"; do
+        "${installer}" --destdir="${D}" --prefix="${prefix}" --disable-ldconfig
+    done
+
+    for installer in "build/tmp/dist/rust-std"*"/install.sh"; do
+        "${installer}" --destdir="${D}" --prefix="${prefix}" --disable-ldconfig
+    done
 
     # Install our custom target.json files
     local td="${D}${libdir}/rustlib/"
@@ -496,6 +433,6 @@ rust_do_install () {
 
 
 do_install () {
-    rust_do_install
+    rust_do_dist_install
 }
 # ex: sts=4 et sw=4 ts=8