rust-native shouldn't depend on TARGET variables

The whole point of rust-native is that it should be common for all
targets.  If we reference TARGET variables during the build of
rust-native, then bitbake will build a different version for different
TARGETS.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+## Version(s) of meta-rust
+
+## Version(s) of poky and/or oe-core
+
+## Expected result
+
+## Actual result
+
+## Steps to reproduce

.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+build/
+poky/

Jenkinsfile

@@ -0,0 +1,39 @@
+def targets = [ 'qemux86', 'qemux86-64', 'qemuarm', 'qemuarm64', 'qemumips' ]
+
+def machine_builds = [:]
+
+for (int i = 0; i < targets.size(); i++) {
+    def machine = targets.get(i)
+
+    machine_builds["$machine"] = {
+        node {
+            try {
+                stage("checkout $machine") {
+                    checkout scm
+                }
+                stage("setup-env $machine") {
+                    sh "./scripts/setup-env.sh"
+                }
+                stage("fetch $machine") {
+                    sh "GIT_LOCAL_REF_DIR=/srv/git-cache/ ./scripts/fetch.sh master"
+                }
+                stage("build $machine") {
+                    sh "MACHINE=${machine} ./scripts/build.sh"
+                }
+            } catch (e) {
+                echo "Caught: ${e}"
+                throw e
+            } finally {
+                stage("push build cache $machine") {
+                    sh "./scripts/publish-build-cache.sh master"
+                }
+                stage("cleanup $machine") {
+                    sh "./scripts/cleanup-env.sh"
+                    deleteDir()
+                }
+            }
+        }
+    }
+}
+
+parallel machine_builds

README.md

@@ -1,65 +1,69 @@
 ## Introduction
 
-This openembedded layer provides the rust compiler, tools for building packages
+This OpenEmbedded layer provides the rust compiler, tools for building packages
 (cargo), and a few example projects.
 
 ## What works:
 
- - MACHINE="beaglebone" (TARGET_SYS=arm-poky-linux-gnueabi)
- - Building rust-native, rust-cross, rust-hello-world, cargo-native
- - Running/using all of these (including rust-hello-world)
+ - Building `rust-native` and `cargo-native`
+ - Building Rust based projects with Cargo for the TARGET
+   - e.g. `rustfmt` which is used by the CI system
+ - `-buildsdk` and `-crosssdk` packages
 
 ## What doesn't:
 
- - Probably some of the untested things
+ - Using anything but x86_64 as the build environment
+ - rust (built for target) issue #81
 
 ## What's untested:
 
- - rust (built for target)
- - Other TARGETs
+ - cargo (built for target)
 
-## Common issues when packaging things using cargo
+## Building a rust package
 
- You may run into errors similar to:
+When building a rust package in bitbake, it's usually easiest to build with
+cargo using cargo.bbclass.  If the package already has a Cargo.toml file (most
+rust packages do), then it's especially easy.  Otherwise you should probably
+get the code building in cargo first.
 
-```
-| src/lib.rs:12:1: 12:35 error: can't find crate for `ffi`
-| src/lib.rs:12 extern crate "openssl-sys" as ffi;
-|               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-```
+Once your package builds in cargo, you can use
+[cargo-bitbake](https://github.com/cardoe/cargo-bitbake) to generate a bitbake
+recipe for it.  This allows bitbake to fetch all the necessary dependent
+crates, as well as a pegged version of the crates.io index, to ensure maximum
+reproducibility.
 
- Where a "-sys" crate (or other crate) is not found. These are typically caused
-by a crate's Cargo.toml including triplet-specific dependencies and then using
-the crate based on a feature (most often, `#[cfg(unix)]`). Until cargo and it's
-ecosystem get their act together, you'll need to supply patches to the
-misbehaving packages. See `recipies/cargo/cargo_*.bb` for an example of how to
-do this.
+NOTE: You will have to edit the generated recipe based on the comments
+contained within it
 
 ## TODO
 
- - -crosssdk and -buildsdk packages
- - Upstream local rustc patches for libdir and bindir support
- - add bitbake fetch support for crates.io
- - add required cargo package registry clones in SRC_URI to prevent the need
-   for network when building.
-
 ## Pitfalls
 
- - TARGET_SYS _must_ be different from BUILD_SYS. This is due to the way configuration options are tracked for different targets.
+ - TARGET_SYS _must_ be different from BUILD_SYS. This is due to the way Rust configuration options are tracked for different targets. This is the reason we use the Yocto triples instead of the native Rust triples. See rust-lang/cargo#3349.
 
 ## Dependencies
 
 On the host:
-	unknown
+ - Any `-sys` packages your project might need must have RDEPENDs for
+ the native library.
 
 On the target:
-	unknown
+ - Any `-sys` packages your project might need must have RDEPENDs for
+ the native library.
 
 ## Maintainer(s) & Patch policy
 
-Open a Pull Request
+Open a Pull Request.
+
+The master branch supports the latest master of poky. When poky creates releases, we will create a branch with the same name as the poky release. This release branch should always work with that poky release. Note that these release branches will typically be less tested than the master branch.
+
+All new patches against rust, rust-llvm, and cargo must have referenced
+upstream issues or PRs opened or an explanation why the patch cannot be
+upstreamed. This cooresponds to the OpenEmbedded policy for other meta layers.
+
+More info can be seen on the wiki.
 
 ## Copyright
 
-MIT/Apache-2.0 - Same as rust
+MIT OR Apache-2.0 - Same as rust
 

classes/cargo.bbclass

@@ -1,116 +1,70 @@
-inherit rust
+##
+## Purpose:
+## This class is used by any recipes that are built using
+## Cargo.
 
-CARGO ?= "cargo"
-export CARGO_HOME = "${WORKDIR}/cargo_home"
+inherit cargo_common
 
-def cargo_base_dep(d):
-    deps = ""
-    if not d.getVar('INHIBIT_DEFAULT_DEPS') and not d.getVar('INHIBIT_CARGO_DEP'):
-        deps += " cargo-native"
-    return deps
+# the binary we will use
+CARGO = "cargo"
 
-BASEDEPENDS_append = " ${@cargo_base_dep(d)}"
+# We need cargo to compile for the target
+BASEDEPENDS_append = " cargo-native"
 
-# FIXME: this is a workaround for a misbehavior in cargo when used with quilt.
-# See https://github.com/rust-lang/cargo/issues/978
-PATCHTOOL = "patch"
+# Ensure we get the right rust variant
+DEPENDS_append_class-target = " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}"
+DEPENDS_append_class-native = " rust-native"
 
 # Cargo only supports in-tree builds at the moment
 B = "${S}"
 
-
 # In case something fails in the build process, give a bit more feedback on
 # where the issue occured
 export RUST_BACKTRACE = "1"
 
-# The pkg-config-rs library used by cargo build scripts disables itself when
-# cross compiling unless this is defined. We set up pkg-config appropriately
-# for cross compilation, so tell it we know better than it.
-export PKG_CONFIG_ALLOW_CROSS = "1"
-
-EXTRA_OECARGO_PATHS ??= ""
-
-cargo_do_configure () {
-	mkdir -p .cargo
-	# FIXME: we currently blow away the entire config because duplicate
-	# sections are treated as a parse error by cargo (causing the entire
-	# config to be silently ignored.
-	# NOTE: we cannot pass more flags via this interface, the 'linker' is
-	# assumed to be a path to a binary. If flags are needed, a wrapper must
-	# be used.
-	echo "paths = [" >.cargo/config
-
-	for p in ${EXTRA_OECARGO_PATHS}; do
-		printf "\"%s\"\n" "$p"
-	done | sed -e 's/$/,/' >>.cargo/config
-	echo "]" >>.cargo/config
-}
-
-rust_cargo_patch () {
-	# FIXME: if there is already an entry for this target, in an existing
-	# cargo/config, this won't work.
-	cd "${S}"
-	cat >>Cargo.toml <<EOF
-[profile.dev]
-rpath = true
-[profile.release]
-rpath = true
-EOF
-}
-
-# All the rust & cargo ecosystem assume that CC, LD, etc are a path to a single
-# command. Fixup the ones we give it so that is the case.
-# XXX: this is hard coded based on meta/conf/bitbake.conf
-# TODO: we do quite a bit very similar to this in rust.inc, see if it can be
-# generalized.
-export RUST_CC = "${CCACHE}${HOST_PREFIX}gcc"
-export RUST_CFLAGS = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${CFLAGS}"
-export RUST_BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc"
-export RUST_BUILD_CFLAGS = "${BUILD_CC_ARCH} ${BUILD_CFLAGS}"
-
-export CARGO_BUILD_FLAGS = "-v --target ${HOST_SYS} --release"
+RUSTFLAGS ??= ""
+BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
+CARGO_BUILD_FLAGS = "-v --target ${HOST_SYS} ${BUILD_MODE}"
 
 # This is based on the content of CARGO_BUILD_FLAGS and generally will need to
 # change if CARGO_BUILD_FLAGS changes.
-export CARGO_TARGET_SUBDIR="${HOST_SYS}/release"
+BUILD_DIR = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
+CARGO_TARGET_SUBDIR="${HOST_SYS}/${BUILD_DIR}"
 oe_cargo_build () {
-	which cargo
-	which rustc
-	bbnote ${CARGO} build ${CARGO_BUILD_FLAGS} "$@"
+	export RUSTFLAGS="${RUSTFLAGS}"
+	export RUST_TARGET_PATH="${RUST_TARGET_PATH}"
+	bbnote "cargo = $(which ${CARGO})"
+	bbnote "rustc = $(which ${RUSTC})"
+	bbnote "${CARGO} build ${CARGO_BUILD_FLAGS} $@"
 	"${CARGO}" build ${CARGO_BUILD_FLAGS} "$@"
 }
 
-oe_cargo_fix_env () {
-	export CC="${RUST_CC}"
-	export CFLAGS="${RUST_CFLAGS}"
-	export AR="${AR}"
-	export TARGET_CC="${RUST_CC}"
-	export TARGET_CFLAGS="${RUST_CFLAGS}"
-	export TARGET_AR="${AR}"
-	export HOST_CC="${RUST_BUILD_CC}"
-	export HOST_CFLAGS="${RUST_BUILD_CFLAGS}"
-	export HOST_AR="${BUILD_AR}"
-}
-
 cargo_do_compile () {
-	cd "${B}"
 	oe_cargo_fix_env
 	oe_cargo_build
 }
 
-# All but the most simple projects will need to override this.
 cargo_do_install () {
 	local have_installed=false
-	install -d "${D}${bindir}"
 	for tgt in "${B}/target/${CARGO_TARGET_SUBDIR}/"*; do
-		if [ -f "$tgt" ] && [ -x "$tgt" ]; then
-			install -m755 "$tgt" "${D}${bindir}"
+		case $tgt in
+		*.so|*.rlib)
+			install -d "${D}${rustlibdir}"
+			install -m755 "$tgt" "${D}${rustlibdir}"
 			have_installed=true
-		fi
+			;;
+		*)
+			if [ -f "$tgt" ] && [ -x "$tgt" ]; then
+				install -d "${D}${bindir}"
+				install -m755 "$tgt" "${D}${bindir}"
+				have_installed=true
+			fi
+			;;
+		esac
 	done
 	if ! $have_installed; then
 		die "Did not find anything to install"
 	fi
 }
 
-EXPORT_FUNCTIONS do_compile do_install do_configure
+EXPORT_FUNCTIONS do_compile do_install

classes/cargo_common.bbclass

@@ -0,0 +1,98 @@
+##
+## Purpose:
+## This class is to support building with cargo. It
+## must be different than cargo.bbclass because Rust
+## now builds with Cargo but cannot use cargo.bbclass
+## due to dependencies and assumptions in cargo.bbclass
+## that Rust & Cargo are already installed. So this
+## is used by cargo.bbclass and Rust
+##
+
+# add crate fetch support
+inherit crate-fetch
+inherit rust-common
+
+# Where we download our registry and dependencies to
+export CARGO_HOME = "${WORKDIR}/cargo_home"
+
+# The pkg-config-rs library used by cargo build scripts disables itself when
+# cross compiling unless this is defined. We set up pkg-config appropriately
+# 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
+
+	for p in ${EXTRA_OECARGO_PATHS}; do
+		printf "\"%s\"\n" "$p"
+	done | sed -e 's/$/,/' >> ${CARGO_HOME}/config
+	echo "]" >> ${CARGO_HOME}/config
+
+	# Point cargo at our local mirror of the registry
+	cat <<- EOF >> ${CARGO_HOME}/config
+	[source.bitbake]
+	directory = "${CARGO_VENDORING_DIRECTORY}"
+	EOF
+
+	if [ -z "${EXTERNALSRC}" ] && [ ${CARGO_DISABLE_BITBAKE_VENDORING} = "0" ]; then
+		cat <<- EOF >> ${CARGO_HOME}/config
+		[source.crates-io]
+		replace-with = "bitbake"
+		local-registry = "/nonexistant"
+		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
+		echo "[target.${BUILD_SYS}]" >> ${CARGO_HOME}/config
+		echo "linker = '${RUST_BUILD_CCLD}'" >> ${CARGO_HOME}/config
+	fi
+}
+
+oe_cargo_fix_env () {
+	export CC="${RUST_TARGET_CC}"
+	export CXX="${RUST_TARGET_CXX}"
+	export CFLAGS="${CFLAGS}"
+	export CXXFLAGS="${CXXFLAGS}"
+	export AR="${AR}"
+	export TARGET_CC="${RUST_TARGET_CC}"
+	export TARGET_CXX="${RUST_TARGET_CXX}"
+	export TARGET_CFLAGS="${CFLAGS}"
+	export TARGET_CXXFLAGS="${CXXFLAGS}"
+	export TARGET_AR="${AR}"
+	export HOST_CC="${RUST_BUILD_CC}"
+	export HOST_CXX="${RUST_BUILD_CXX}"
+	export HOST_CFLAGS="${BUILD_CFLAGS}"
+	export HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
+	export HOST_AR="${BUILD_AR}"
+}
+
+EXTRA_OECARGO_PATHS ??= ""
+
+EXPORT_FUNCTIONS do_configure

classes/crate-fetch.bbclass

@@ -0,0 +1,13 @@
+#
+# crate-fetch class
+#
+# Registers 'crate' method for Bitbake fetch2.
+#
+# Adds support for following format in recipe SRC_URI:
+# crate://<packagename>/<version>
+#
+
+python () {
+        import crate
+        bb.fetch2.methods.append( crate.Crate() )
+}

classes/rust-bin.bbclass

@@ -1,15 +1,8 @@
 inherit rust
 
-RUSTLIB_DEP ?= " rustlib"
-DEPENDS .= "${RUSTLIB_DEP}"
-DEPENDS += "patchelf-native"
+RDEPENDS_${PN}_append_class-target += "${RUSTLIB_DEP}"
 
-export rustlibdir = "${libdir}/rust"
-FILES_${PN} += "${rustlibdir}/*.so"
-FILES_${PN}-dev += "${rustlibdir}/*.rlib"
-FILES_${PN}-dbg += "${rustlibdir}/.debug"
-
-RUSTC_ARCHFLAGS += "-C opt-level=3 -g -L ${STAGING_DIR_HOST}/${rustlibdir}"
+RUSTC_ARCHFLAGS += "-C opt-level=3 -g -L ${STAGING_DIR_HOST}/${rustlibdir} -C linker=${RUST_TARGET_CCLD}"
 EXTRA_OEMAKE += 'RUSTC_ARCHFLAGS="${RUSTC_ARCHFLAGS}"'
 
 # Some libraries alias with the standard library but libstd is configured to
@@ -19,11 +12,12 @@ OVERLAP_LIBS = "\
     libc \
     log \
     getopts \
+    rand \
 "
 def get_overlap_deps(d):
     deps = d.getVar("DEPENDS").split()
     overlap_deps = []
-    for o in d.getVar("OVERLAP_LIBS", True).split():
+    for o in d.getVar("OVERLAP_LIBS").split():
         l = len([o for dep in deps if (o + '-rs' in dep)])
         if l > 0:
             overlap_deps.append(o)
@@ -32,20 +26,58 @@ OVERLAP_DEPS = "${@get_overlap_deps(d)}"
 
 # Prevents multiple static copies of standard library modules
 # See https://github.com/rust-lang/rust/issues/19680
-RUSTC_FLAGS += "-C prefer-dynamic"
+RUSTC_PREFER_DYNAMIC = "-C prefer-dynamic"
+RUSTC_FLAGS += "${RUSTC_PREFER_DYNAMIC}"
 
-rustlib="${libdir}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib"
-CRATE_NAME ?= "${@d.getVar('BPN', True).replace('-rs', '').replace('-', '_')}"
+CRATE_NAME ?= "${@d.getVar('BPN').replace('-rs', '').replace('-', '_')}"
 BINNAME ?= "${BPN}"
-LIBNAME ?= "lib${CRATE_NAME}"
+LIBNAME ?= "lib${CRATE_NAME}-rs"
 CRATE_TYPE ?= "dylib"
 BIN_SRC ?= "${S}/src/main.rs"
 LIB_SRC ?= "${S}/src/lib.rs"
 
+rustbindest ?= "${bindir}"
+rustlibdest ?= "${rustlibdir}"
+RUST_RPATH_ABS ?= "${rustlibdir}:${rustlib}"
+
+def relative_rpaths(paths, base):
+    relpaths = set()
+    for p in paths.split(':'):
+        if p == base:
+            relpaths.add('$ORIGIN')
+            continue
+        relpaths.add(os.path.join('$ORIGIN', os.path.relpath(p, base)))
+    return '-rpath=' + ':'.join(relpaths) if len(relpaths) else ''
+
+RUST_LIB_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS', True), d.getVar('rustlibdest', True))}"
+RUST_BIN_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS', True), d.getVar('rustbindest', True))}"
+
+def libfilename(d):
+    if d.getVar('CRATE_TYPE', True) == 'dylib':
+        return d.getVar('LIBNAME', True) + '.so'
+    else:
+        return d.getVar('LIBNAME', True) + '.rlib'
+
+def link_args(d, bin):
+    linkargs = []
+    if bin:
+        rpaths = d.getVar('RUST_BIN_RPATH_FLAGS', False)
+    else:
+        rpaths = d.getVar('RUST_LIB_RPATH_FLAGS', False)
+        if d.getVar('CRATE_TYPE', True) == 'dylib':
+            linkargs.append('-soname')
+            linkargs.append(libfilename(d))
+    if len(rpaths):
+        linkargs.append(rpaths)
+    if len(linkargs):
+        return ' '.join(['-Wl,' + arg for arg in linkargs])
+    else:
+        return ''
+
 get_overlap_externs () {
     externs=
     for dep in ${OVERLAP_DEPS}; do
-        extern=$(ls ${STAGING_DIR_HOST}/${rustlibdir}/lib$dep.{so,rlib} 2>/dev/null \
+        extern=$(ls ${STAGING_DIR_HOST}/${rustlibdir}/lib$dep-rs.{so,rlib} 2>/dev/null \
                     | awk '{print $1}');
         if [ -n "$extern" ]; then
             externs="$externs --extern $dep=$extern"
@@ -57,16 +89,26 @@ get_overlap_externs () {
     echo "$externs"
 }
 
+do_configure () {
+}
+
+oe_runrustc () {
+	export RUST_TARGET_PATH="${RUST_TARGET_PATH}"
+	bbnote ${RUSTC} ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
+	"${RUSTC}" ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
+}
+
 oe_compile_rust_lib () {
     rm -rf ${LIBNAME}.{rlib,so}
     local -a link_args
-    if [ "${CRATE_TYPE}" == "dylib" ]; then
-        link_args[0]="-C"
-        link_args[1]="link-args=-Wl,-soname -Wl,${LIBNAME}.so"
+    if [ -n '${@link_args(d, False)}' ]; then
+        link_args[0]='-C'
+        link_args[1]='link-args=${@link_args(d, False)}'
     fi
     oe_runrustc $(get_overlap_externs) \
         "${link_args[@]}" \
         ${LIB_SRC} \
+        -o ${@libfilename(d)} \
         --crate-name=${CRATE_NAME} --crate-type=${CRATE_TYPE} \
         "$@"
 }
@@ -74,20 +116,27 @@ oe_compile_rust_lib[vardeps] += "get_overlap_externs"
 
 oe_compile_rust_bin () {
     rm -rf ${BINNAME}
-    oe_runrustc $(get_overlap_externs) ${BIN_SRC} -o ${BINNAME} "$@"
+    local -a link_args
+    if [ -n '${@link_args(d, True)}' ]; then
+        link_args[0]='-C'
+        link_args[1]='link-args=${@link_args(d, True)}'
+    fi
+    oe_runrustc $(get_overlap_externs) \
+        "${link_args[@]}" \
+        ${BIN_SRC} -o ${BINNAME} "$@"
 }
 oe_compile_rust_bin[vardeps] += "get_overlap_externs"
 
 oe_install_rust_lib () {
     for lib in $(ls ${LIBNAME}.{so,rlib} 2>/dev/null); do
         echo Installing $lib
-        install -D -m 755 $lib ${D}/${rustlibdir}/$lib
+        install -D -m 755 $lib ${D}/${rustlibdest}/$lib
     done
 }
 
 oe_install_rust_bin () {
     echo Installing ${BINNAME}
-    install -D -m 755 ${BINNAME} ${D}/${bindir}/${BINNAME}
+    install -D -m 755 ${BINNAME} ${D}/${rustbindest}/${BINNAME}
 }
 
 do_rust_bin_fixups() {
@@ -95,13 +144,6 @@ do_rust_bin_fixups() {
         echo "Strip rust note: $f"
         ${OBJCOPY} -R .note.rustc $f $f
     done
-
-    for f in `find ${PKGD}`; do
-        file "$f" | grep -q ELF || continue
-        readelf -d "$f" | grep RPATH | grep -q rustlib || continue
-        echo "Set rpath:" "$f"
-        patchelf --set-rpath '$ORIGIN:'${rustlibdir}:${rustlib} "$f"
-    done
 }
-
 PACKAGE_PREPROCESS_FUNCS += "do_rust_bin_fixups"
+

classes/rust-common.bbclass

@@ -0,0 +1,144 @@
+# Common variables used by all Rust builds
+export rustlibdir = "${libdir}/rust"
+FILES_${PN} += "${rustlibdir}/*.so"
+FILES_${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta"
+FILES_${PN}-dbg += "${rustlibdir}/.debug"
+
+RUSTLIB = "-L ${STAGING_LIBDIR}/rust"
+RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/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
+    rust/mk/cfg/* for a list)
+
+    Note that os is assumed to be some linux form
+    '''
+
+    arch = d.getVar('{}_ARCH'.format(thing))
+    # All the Yocto targets are Linux and are 'unknown'
+    vendor = "-unknown"
+    os = d.getVar('{}_OS'.format(thing))
+    libc = determine_libc(d, thing)
+
+    # Prefix with a dash and convert glibc -> gnu
+    if libc == "glibc":
+        libc = "-gnu"
+    elif libc == "musl":
+        libc = "-musl"
+
+    # Don't double up musl (only appears to be the case on aarch64)
+    if os == "linux-musl":
+        if libc != "-musl":
+            bb.fatal("{}_OS was '{}' but TCLIBC was not 'musl'".format(thing, os))
+        os = "linux"
+
+    # This catches ARM targets and appends the necessary hard float bits
+    if os == "linux-gnueabi" or os == "linux-musleabi":
+        libc = bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hf', '', d)
+    return arch + vendor + '-' + os + libc
+
+# Naming explanation
+# Yocto
+# - BUILD_SYS - Yocto triple of the build environment
+# - HOST_SYS - What we're building for in Yocto
+# - TARGET_SYS - What we're building for in Yocto
+#
+# So when building '-native' packages BUILD_SYS == HOST_SYS == TARGET_SYS
+# When building packages for the image HOST_SYS == TARGET_SYS
+# This is a gross over simplification as there are other modes but
+# currently this is all that's supported.
+#
+# Rust
+# - TARGET - the system where the binary will run
+# - HOST - the system where the binary is being built
+#
+# Rust additionally will use two additional cases:
+# - undecorated (e.g. CC) - equivalent to TARGET
+# - triple suffix (e.g. CC_x86_64_unknown_linux_gnu) - both
+#   see: https://github.com/alexcrichton/gcc-rs
+# The way that Rust's internal triples and Yocto triples are mapped together
+# its likely best to not use the triple suffix due to potential confusion.
+
+RUST_BUILD_SYS = "${@rust_base_triple(d, 'BUILD')}"
+RUST_HOST_SYS = "${@rust_base_triple(d, 'HOST')}"
+RUST_TARGET_SYS = "${@rust_base_triple(d, 'TARGET')}"
+
+# wrappers to get around the fact that Rust needs a single
+# binary but Yocto's compiler and linker commands have
+# arguments. Technically the archiver is always one command but
+# this is necessary for builds that determine the prefix and then
+# use those commands based on the prefix.
+WRAPPER_DIR = "${WORKDIR}/wrapper"
+RUST_BUILD_CC = "${WRAPPER_DIR}/build-rust-cc"
+RUST_BUILD_CXX = "${WRAPPER_DIR}/build-rust-cxx"
+RUST_BUILD_CCLD = "${WRAPPER_DIR}/build-rust-ccld"
+RUST_BUILD_AR = "${WRAPPER_DIR}/build-rust-ar"
+RUST_TARGET_CC = "${WRAPPER_DIR}/target-rust-cc"
+RUST_TARGET_CXX = "${WRAPPER_DIR}/target-rust-cxx"
+RUST_TARGET_CCLD = "${WRAPPER_DIR}/target-rust-ccld"
+RUST_TARGET_AR = "${WRAPPER_DIR}/target-rust-ar"
+
+create_wrapper () {
+	file="$1"
+	shift
+
+	cat <<- EOF > "${file}"
+	#!/bin/sh
+	exec $@ "\$@"
+	EOF
+	chmod +x "${file}"
+}
+
+# compiler is used by gcc-rs
+# linker is used by rustc/cargo
+# archiver is used by the build of libstd-rs
+do_rust_create_wrappers () {
+	mkdir -p "${WRAPPER_DIR}"
+
+	# Yocto Build / Rust Host C compiler
+	create_wrapper "${RUST_BUILD_CC}" "${BUILD_CC}"
+	# Yocto Build / Rust Host C++ compiler
+	create_wrapper "${RUST_BUILD_CXX}" "${BUILD_CXX}"
+	# Yocto Build / Rust Host linker
+	create_wrapper "${RUST_BUILD_CCLD}" "${BUILD_CCLD}" "${BUILD_LDFLAGS}"
+	# Yocto Build / Rust Host archiver
+	create_wrapper "${RUST_BUILD_AR}" "${BUILD_AR}"
+
+	# Yocto Target / Rust Target C compiler
+	create_wrapper "${RUST_TARGET_CC}" "${CC}"
+	# Yocto Target / Rust Target C++ compiler
+	create_wrapper "${RUST_TARGET_CXX}" "${CXX}"
+	# Yocto Target / Rust Target linker
+	create_wrapper "${RUST_TARGET_CCLD}" "${CCLD}" "${LDFLAGS}"
+	# Yocto Target / Rust Target archiver
+	create_wrapper "${RUST_TARGET_AR}" "${AR}"
+}
+
+addtask rust_create_wrappers before do_configure after do_patch
+do_rust_create_wrappers[dirs] += "${WRAPPER_DIR}"

classes/rust-installer.bbclass

@@ -1,15 +0,0 @@
-# Rust installer isn't very nice and drops a bunch of junk in our filesystem,
-# clean it up after the install.
-
-rust_installer_do_install () {
-	rm ${D}/${libdir}/rustlib/install.log
-	rm ${D}/${libdir}/rustlib/rust-installer-version
-	rm ${D}/${libdir}/rustlib/uninstall.sh
-	rm ${D}/${libdir}/rustlib/components
-}
-
-do_install_append () {
-	rust_installer_do_install
-}
-
-EXPORT_FUNCTIONS rust_installer_do_install

classes/rust.bbclass

@@ -1,49 +1,22 @@
+inherit rust-common
+
 RUSTC = "rustc"
 
-# FIXME: --sysroot might be needed
-RUSTC_ARCHFLAGS += "--target=${TARGET_SYS} -C rpath"
+RUSTC_ARCHFLAGS += "--target=${HOST_SYS} ${RUSTFLAGS}"
 
 def rust_base_dep(d):
     # Taken from meta/classes/base.bbclass `base_dep_prepend` and modified to
     # use rust instead of gcc
     deps = ""
     if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS'):
-        if (d.getVar('HOST_SYS', True) != d.getVar('BUILD_SYS', True)):
-            deps += " virtual/${TARGET_PREFIX}rust"
+        if (d.getVar('HOST_SYS') != d.getVar('BUILD_SYS')):
+            deps += " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}"
         else:
             deps += " rust-native"
     return deps
 
 DEPENDS_append = " ${@rust_base_dep(d)}"
 
-def rust_base_triple(d, thing):
-    '''
-    Mangle bitbake's *_SYS into something that rust might support (see
-    rust/mk/cfg/* for a list)
-
-    Note that os is assumed to be some linux form
-    '''
-
-    arch = d.getVar('{}_ARCH'.format(thing), True)
-    vendor = d.getVar('{}_VENDOR'.format(thing), True)
-    os = d.getVar('{}_OS'.format(thing), True)
-
-    vendor = "-unknown"
-
-    if arch.startswith("arm"):
-        if os.endswith("gnueabi"):
-            os += bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hf', '', d)
-    elif arch.startswith("x86_64"):
-        os = "linux-gnu"
-    elif arch.startswith("i586"):
-        arch = "i686"
-        os = "linux-gnu"
-    return arch + vendor + '-' + os
-
-RUST_BUILD_SYS = "${@rust_base_triple(d, 'BUILD')}"
-RUST_HOST_SYS = "${@rust_base_triple(d, 'HOST')}"
-RUST_TARGET_SYS = "${@rust_base_triple(d, 'TARGET')}"
-
 # BUILD_LDFLAGS
 # 	${STAGING_LIBDIR_NATIVE}
 # 	${STAGING_BASE_LIBDIR_NATIVE}
@@ -57,26 +30,16 @@ RUST_TARGET_SYS = "${@rust_base_triple(d, 'TARGET')}"
 #	-L${STAGING_BASE_LIBDIR_NATIVE}	\
 #"
 
-RUST_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}:${STAGING_BASE_LIBDIR_NATIVE}"
-
-## Note: the 'rustlib' element of this was a workaround rustc forgetting the
-## libdir it was built with. It now remembers so this should be unneeded
-#RUST_PATH_NATIVE .= ":${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/rustlib/${TARGET_SYS}/lib"
-
-# FIXME: set based on whether we are native vs cross vs buildsdk, etc
-#export RUST_PATH ??= "${RUST_PATH_NATIVE}"
-
-## This is builtin to rustc with the value "$libdir/rust/targets"
-# RUST_TARGET_PATH = "foo:bar"
-
-oe_runrustc () {
-	bbnote ${RUSTC} ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
-	"${RUSTC}" ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
-}
-
 # XXX: for some reason bitbake sets BUILD_* & TARGET_* but uses the bare
 # variables for HOST. Alias things to make it easier for us.
 HOST_LDFLAGS  ?= "${LDFLAGS}"
 HOST_CFLAGS   ?= "${CFLAGS}"
 HOST_CXXFLAGS ?= "${CXXFLAGS}"
 HOST_CPPFLAGS ?= "${CPPFLAGS}"
+
+rustlib_suffix="${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib"
+# Native sysroot standard library path
+rustlib_src="${prefix}/lib/${rustlib_suffix}"
+# Host sysroot standard library path
+rustlib="${libdir}/${rustlib_suffix}"
+rustlib_class-native="${libdir}/rustlib/${BUILD_SYS}/lib"

conf/bblayers.conf.sample

@@ -0,0 +1,20 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta-rust \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-yocto-bsp \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  "

conf/distro/include/rust_security_flags.inc

@@ -1,4 +1,7 @@
 # Build errors with PIE options enabled
 SECURITY_CFLAGS_pn-rust-native = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-rust-cross = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-rust-cross-${TARGET_ARCH} = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-rust = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-rust-llvm = "${SECURITY_NO_PIE_CFLAGS}"
+
+SECURITY_LDFLAGS_pn-rust-cross-arm = " -lssp_nonshared -lssp"

conf/layer.conf

@@ -2,13 +2,14 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "rust-layer"
 BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_rust-layer = "7"
 
-LICENSE_PATH += "${LAYERDIR}/files/licenses"
+LAYERDEPENDS_rust-layer = "core openembedded-layer"
+LAYERSERIES_COMPAT_rust-layer = "rocko sumo thud warrior zeus dunfell"
 
 # Override security flags
 require conf/distro/include/rust_security_flags.inc

conf/licenses.conf

@@ -1 +0,0 @@
-SRC_DISTRIBUTE_LICENSES += "GPL-2.0-with-linking-exception"

conf/local.conf.sample

@@ -0,0 +1,242 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemumips64"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "mpc8315e-rdb"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86 if no other machine is selected:
+MACHINE ??= "qemux86-64"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing 
+# these defaults.
+#
+DISTRO ?= "poky"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream 
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends
+# can be enabled at once and the first item listed in the variable will be used
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+PACKAGE_CLASSES ?= "package_rpm"
+
+#
+# SDK target architecture
+#
+# This variable specifies the architecture to build SDK items for and means
+# you can build the SDK packages for architectures other than the machine you are
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686 and x86_64
+#SDKMACHINE ?= "i686"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable
+# are:
+#   - 'buildstats' collect build statistics
+#   - 'image-mklibs' to reduce shared library files size for an image
+#   - 'image-prelink' in order to prelink the filesystem image
+#   - 'image-swab' to perform host system intrusion detection
+# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
+# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+# image-prelink disabled for now due to issues with IFUNC symbol relocation
+USER_CLASSES ?= "buildstats image-mklibs"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. To
+# enable this uncomment this line. See classes/testimage(-auto).bbclass for
+# further details.
+#TEST_IMAGE = "1"
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it
+# can launch an interactive shell. It needs to do this since the build is
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necesary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+SSTATE_MIRRORS ?= "file://.* http://build-cache.asterius.io/master/sstate-cache/PATH;downloadfilename=PATH \n"
+
+SOURCE_MIRROR_URL ?= "http://build-cache.asterius.io/downloads/"
+INHERIT += "own-mirrors rm_work"
+
+#
+# Qemu configuration
+#
+# By default qemu will build with a builtin VNC server where graphical output can be
+# seen. The two lines below enable the SDL backend too. By default libsdl-native will
+# be built, if you want to use your host's libSDL instead of the minimal libsdl built
+# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
+PACKAGECONFIG_append_pn-qemu-native = " sdl"
+PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+#ASSUME_PROVIDED += "libsdl-native"
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "1"

files/common-licenses/GPL-2.0-with-linking-exception

@@ -1,11 +0,0 @@
-LINKING EXCEPTION
-
-In addition to the permissions in the GNU General Public License, the authors
-give you unlimited permission to link the compiled version of this library into
-combinations with other programs, and to distribute those combinations without
-any restriction coming from the use of this file.  (The General Public License
-restrictions do apply in other respects; for example, they cover modification
-of the file, and distribution when not linked into a combined executable.)
-
-
-insert GPL v2 text here

lib/crate.py

@@ -0,0 +1,149 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake 'Fetch' implementation for crates.io
+"""
+
+# Copyright (C) 2016 Doug Goldstein
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Based on functions from the base bb module, Copyright 2003 Holger Schurig
+
+import hashlib
+import json
+import os
+import shutil
+import subprocess
+import bb
+from   bb.fetch2 import logger, subprocess_setup, UnpackError
+from   bb.fetch2.wget import Wget
+
+
+class Crate(Wget):
+
+    """Class to fetch crates via wget"""
+
+    def _cargo_bitbake_path(self, rootdir):
+        return os.path.join(rootdir, "cargo_home", "bitbake")
+
+    def supports(self, ud, d):
+        """
+        Check to see if a given url is for this fetcher
+        """
+        return ud.type in ['crate']
+
+    def recommends_checksum(self, urldata):
+        return False
+
+    def urldata_init(self, ud, d):
+        """
+        Sets up to download the respective crate from crates.io
+        """
+
+        if ud.type == 'crate':
+            self._crate_urldata_init(ud, d)
+
+        super(Crate, self).urldata_init(ud, d)
+
+    def _crate_urldata_init(self, ud, d):
+        """
+        Sets up the download for a crate
+        """
+
+        # URL syntax is: crate://NAME/VERSION
+        # break the URL apart by /
+        parts = ud.url.split('/')
+        if len(parts) < 5:
+            raise bb.fetch2.ParameterError("Invalid URL: Must be crate://HOST/NAME/VERSION", ud.url)
+
+        # last field is version
+        version = parts[len(parts) - 1]
+        # second to last field is name
+        name = parts[len(parts) - 2]
+        # host (this is to allow custom crate registries to be specified
+        host = '/'.join(parts[2:len(parts) - 2])
+
+        # if using upstream just fix it up nicely
+        if host == 'crates.io':
+            host = 'crates.io/api/v1/crates'
+
+        ud.url = "https://%s/%s/%s/download" % (host, name, version)
+        ud.parm['downloadfilename'] = "%s-%s.crate" % (name, version)
+        ud.parm['name'] = name
+
+        logger.debug(2, "Fetching %s to %s" % (ud.url, ud.parm['downloadfilename']))
+
+    def unpack(self, ud, rootdir, d):
+        """
+        Uses the crate to build the necessary paths for cargo to utilize it
+        """
+        if ud.type == 'crate':
+            return self._crate_unpack(ud, rootdir, d)
+        else:
+            super(Crate, self).unpack(ud, rootdir, d)
+
+    def _crate_unpack(self, ud, rootdir, d):
+        """
+        Unpacks a crate
+        """
+        thefile = ud.localpath
+
+        # possible metadata we need to write out
+        metadata = {}
+
+        # change to the rootdir to unpack but save the old working dir
+        save_cwd = os.getcwd()
+        os.chdir(rootdir)
+
+        pn = d.getVar('BPN')
+        if pn == ud.parm.get('name'):
+            cmd = "tar -xz --no-same-owner -f %s" % thefile
+        else:
+            cargo_bitbake = self._cargo_bitbake_path(rootdir)
+
+            cmd = "tar -xz --no-same-owner -f %s -C %s" % (thefile, cargo_bitbake)
+
+            # ensure we've got these paths made
+            bb.utils.mkdirhier(cargo_bitbake)
+
+            # generate metadata necessary
+            with open(thefile, 'rb') as f:
+                # get the SHA256 of the original tarball
+                tarhash = hashlib.sha256(f.read()).hexdigest()
+
+            metadata['files'] = {}
+            metadata['package'] = tarhash
+
+        # path it
+        path = d.getVar('PATH')
+        if path:
+            cmd = "PATH=\"%s\" %s" % (path, cmd)
+        bb.note("Unpacking %s to %s/" % (thefile, os.getcwd()))
+
+        ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True)
+
+        os.chdir(save_cwd)
+
+        if ret != 0:
+            raise UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), ud.url)
+
+        # if we have metadata to write out..
+        if len(metadata) > 0:
+            cratepath = os.path.splitext(os.path.basename(thefile))[0]
+            bbpath = self._cargo_bitbake_path(rootdir)
+            mdfile = '.cargo-checksum.json'
+            mdpath = os.path.join(bbpath, cratepath, mdfile)
+            with open(mdpath, "w") as f:
+                json.dump(metadata, f)

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

@@ -1,20 +0,0 @@
-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
-}

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

@@ -1,20 +0,0 @@
-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/getopts/getopts-rs_0.2.11.bb

@@ -1,23 +0,0 @@
-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/libc/libc-rs_0.1.8.bb

@@ -1,24 +0,0 @@
-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=615cc94ba6f721c4ed3d6988605e85ca \
-	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
-"
-
-inherit rust-bin
-
-# SRC_URI = "git://git@github.com:rust-lang/libc.git;protocol=https"
-# libc lives in rust-lang/rust which is a submodule of rust-lang/libc
-SRC_URI = "gitsm://github.com/rust-lang/rust.git;protocol=https"
-SRCREV = "8b7c17db2235a2a3f2c71242b11fc429a8d05a90"
-
-S = "${WORKDIR}/git"
-
-do_compile () {
-	oe_runrustc ${S}/src/liblibc/lib.rs --cfg feature='"cargo-build"'
-}
-
-do_install () {
-	install -D -m 644 liblibc.rlib ${D}/${rustlibdir}/liblibc.rlib
-}

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

@@ -1,6 +0,0 @@
-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

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

recipes-core/log/log.inc

@@ -1,22 +0,0 @@
-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.3.bb

@@ -1,23 +0,0 @@
-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 = "a91e63378bf6f4bba5c7d88f4fe98efdcb432c99"
-
-S = "${WORKDIR}/git"
-
-# This module is tiny. One wrapper function only.
-CRATE_TYPE = "rlib"
-
-do_compile () {
-	oe_compile_rust_lib
-}
-
-do_install () {
-	oe_install_rust_lib
-}

recipes-core/regex/regex-rs.bb

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

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

@@ -1,7 +0,0 @@
-DESCRIPTION = "A regular expression parser"
-
-require regex.inc
-
-# Should only be used directly by regex
-CRATE_TYPE = "rlib"
-LIB_SRC = "${S}/regex-syntax/src/lib.rs"

recipes-core/regex/regex.inc

@@ -1,22 +0,0 @@
-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/time/time-rs_0.1.26.bb

@@ -1,23 +0,0 @@
-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 = "32b212b877b836dbfdc97af5674d91672e70ecbd"
-
-S = "${WORKDIR}/git"
-
-do_compile () {
-	oe_compile_rust_lib
-}
-
-do_install () {
-	oe_install_rust_lib
-}

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

@@ -1,20 +0,0 @@
-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-sys-rs_0.1.1.bb

@@ -1,23 +0,0 @@
-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"
-CRATE_TYPE = "rlib"
-
-do_compile () {
-	oe_compile_rust_lib
-}
-
-do_install () {
-	oe_install_rust_lib
-}

recipes-deps/curl/curl_%.bbappend

@@ -1,27 +0,0 @@
-
-## An excerpt from curl-sys's build script:
-#export CFLAGS := $(CFLAGS) -fPIC -ffunction-sections -fdata-sections
-#OPTS := $(OPTS) \
-#        --enable-static=yes \
-#        --enable-shared=no \
-#	--disable-ldap --disable-ldaps --disable-ftp --disable-rtsp \
-#	--disable-dict --disable-telnet --disable-tftp --disable-pop3 \
-#	--disable-imap --disable-smtp --disable-gopher --disable-manual \
-#	--enable-optimize --without-librtmp --without-libidn \
-#        --prefix="$(OUT_DIR)"
-## Due to how rust links, we need -fPIC. Without it,
-
-#EXTRA_OECONF_append = " \
-#	--with-zlib	\
-#	--enable-static \
-#	--enable-hidden-symbols \
-#"
-
-#BUILD_CFLAGS += "-fPIC"
-#TARGET_CFLAGS += "-fPIC"
-
-#| note: /usr/bin/ld: .../tmp/work/x86_64-linux/cargo-native/2014-11-07-r0/git/target/x86_64-unknown-linux-gnu/deps/libcurl-f3f9ef32955b72e6.rlib(r-curl-libcurl_la-openssl.o): undefined reference to symbol 'SSL_CTX_set_cipher_list'
-#| /usr/lib/libssl.so.1.0.0: error adding symbols: DSO missing from command line
-#DEPENDS_append = "openssl"
-PACKAGECONFIG = "ipv6"
-CFLAGS_append = " -fPIC"

recipes-deps/libgit2/libgit2-git.inc

@@ -1,3 +0,0 @@
-require libgit2.inc
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/libgit2/libgit2.git;protocol=https"

recipes-deps/libgit2/libgit2-release.inc

@@ -1,3 +0,0 @@
-require libgit2.inc
-SRC_URI = "https://github.com/libgit2/libgit2/archive/v${PV}.tar.gz"
-

recipes-deps/libgit2/libgit2.inc

@@ -1,32 +0,0 @@
-SUMMARY = "the Git linkable library"
-HOMEPAGE = "http://libgit2.github.com/"
-LICENSE = "GPL-2.0-with-linking-exception"
-
-DEPENDS = "zlib"
-
-inherit cmake
-
-# CLAR = tests, needs python-native
-EXTRA_OECMAKE = "\
-	-DTHREADSAFE=ON \
-	-DBUILD_CLAR=OFF \
-	-DSHA1_TYPE="builtin" \
-	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DBUILD_SHARED_LIBS=OFF \
-	-DBUILD_EXAMPLES=OFF \
-"
-
-CFLAGS_append .= " -fPIC"
-
-# Prior to poky commit 60d504b431fa7cdc6ded141def7ae18edb1834e5,
-# the cmake class did not define CMAKE_AR in the generated toolchain
-# file.  This is needed to support building a static library.
-# See https://github.com/jmesmon/meta-rust/issues/1
-OECMAKE_AR ?= "${AR}"
-cmake_do_generate_toolchain_file_append() {
-    cat >> ${WORKDIR}/toolchain.cmake <<EOF
-set( CMAKE_AR ${OECMAKE_AR} CACHE FILEPATH "Archiver" )
-EOF
-}
-
-BBCLASSEXTEND = "native"

recipes-deps/libgit2/libgit2_0.22.1.bb

@@ -1,6 +0,0 @@
-LIC_FILES_CHKSUM = "file://COPYING;md5=29c24df0df4c2bab5efb8d5a33a73202"
-
-SRC_URI[md5sum] = "dbf516d18e176bbb131de3efccfee533"
-SRC_URI[sha256sum] = "c7f1bf99ed8aeba65a485489869e2a50f022f3cd847df85e192fc99fdd6c8b5e"
-
-require libgit2-release.inc

recipes-deps/libgit2/libgit2_0.23.2.bb

@@ -1,10 +0,0 @@
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2"
-
-SRC_URI[md5sum] = "ade3b85d759866c03b6188e397b652fa"
-SRC_URI[sha256sum] = "20c0a6ee92c0e19207dac6ddc336b4ae4a1c4ddf91be0891e4b6e6ccba16df0b"
-
-require libgit2-release.inc
-
-# Broken due to too old cargo using too old git2-rs
-DEFAULT_PREFERENCE = "-1"

recipes-deps/libgit2/libgit2_git.bb

@@ -1,3 +0,0 @@
-require libgit2-git.inc
-SRCREV ?= "47f37400253210f483d84fb9c2ecf44fb5986849"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5ddd5fb64b24982b32a490dccccdabc5"

recipes-deps/libssh2/libssh2_%.bbappend

@@ -1,2 +0,0 @@
-# meta-oe/recipes-support/libssh2
-BBCLASSEXTEND = "native"

recipes-deps/zlib/zlib_%.bbappend

@@ -1,3 +0,0 @@
-# cargo tries to build a shared object using several static objects, one of
-# which includes the contents of zlib (zutil.o as 'libcurl-f3f9ef32955b72e6.rlib(r-z-zutil.o)')
-CFLAGS_append = " -fPIC"

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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,43 @@
+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 \
+"
+
+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
+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_1.34.2.bb

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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/libstd-rs.inc

@@ -0,0 +1,31 @@
+SUMMARY = "Rust standard libaries"
+HOMEPAGE = "http://www.rust-lang.org"
+SECTION = "devel"
+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
+    export RUSTC_BOOTSTRAP="1"
+}
+
+do_install () {
+    mkdir -p ${D}${rustlibdir}
+
+    # 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}
+}

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,67 @@
+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"
+
+# Unlike native (which nicely maps it's DEPENDS) cross wipes them out completely.
+# Generally, we (and cross in general) need the same things that native needs,
+# so it might make sense to take it's mapping. For now, though, we just mention
+# the bits we need explicitly.
+DEPENDS += "rust-llvm-native"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
+DEPENDS += "rust-native"
+
+PROVIDES = "virtual/${TARGET_PREFIX}rust"
+PN = "rust-cross-${TARGET_ARCH}"
+
+# In the cross compilation case, rustc doesn't seem to get the rpath quite
+# right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't
+# include the '../../lib' (ie: relative path from cross_bindir to normal
+# libdir. As a result, we end up not being able to properly reference files in normal ${libdir}.
+# Most of the time this happens to work fine as the systems libraries are
+# subsituted, but sometimes a host system will lack a library, or the right
+# version of a library (libtinfo was how I noticed this).
+#
+# FIXME: this should really be fixed in rust itself.
+# FIXME: using hard-coded relative paths is wrong, we should ask bitbake for
+#        the relative path between 2 of it's vars.
+HOST_POST_LINK_ARGS_append = " -Wl,-rpath=../../lib"
+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 () {
+}
+
+do_compile () {
+}
+
+do_install () {
+	mkdir -p ${D}${prefix}/${base_libdir_native}/rustlib
+	cp ${WORKDIR}/targets/${TARGET_SYS}.json ${D}${prefix}/${base_libdir_native}/rustlib
+}
+
+rust_cross_sysroot_preprocess() {
+    sysroot_stage_dir ${D}${prefix}/${base_libdir_native}/rustlib ${SYSROOT_DESTDIR}${prefix}/${base_libdir_native}/rustlib
+}
+SYSROOT_PREPROCESS_FUNCS += "rust_cross_sysroot_preprocess"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

recipes-devtools/rust/rust-llvm.inc

@@ -0,0 +1,62 @@
+SUMMARY = "LLVM compiler framework (packaged with rust)"
+LICENSE ?= "Apache-2.0-with-LLVM-exception"
+
+SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch"
+
+S = "${RUSTSRC}/src/llvm-project/llvm"
+
+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}"
+
+EXTRA_OECMAKE = " \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;PowerPC;Mips' \
+    -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_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_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
+}
+
+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"
+
+BBCLASSEXTEND = "native"

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

@@ -0,0 +1,32 @@
+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.34.2.bb

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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.39.0.bb

@@ -0,0 +1,16 @@
+require rust-source-${PV}.inc
+require rust-llvm.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
+
+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.40.0.bb

@@ -0,0 +1,16 @@
+require rust-source-${PV}.inc
+require rust-llvm.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
+
+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.41.0.bb

@@ -0,0 +1,16 @@
+require rust-source-${PV}.inc
+require rust-llvm.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
+
+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.34.2.inc

@@ -0,0 +1,24 @@
+## 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

@@ -0,0 +1,24 @@
+## 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

@@ -0,0 +1,24 @@
+## 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

@@ -0,0 +1,24 @@
+## 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

@@ -0,0 +1,24 @@
+## 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

@@ -0,0 +1,24 @@
+## 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.34.2.inc

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,501 @@
+SUMMARY = "Rust compiler and runtime libaries"
+HOMEPAGE = "http://www.rust-lang.org"
+SECTION = "devel"
+LICENSE = "MIT | Apache-2.0"
+
+inherit rust
+inherit cargo_common
+
+DEPENDS += "file-native python3-native"
+DEPENDS_append_class-native = " rust-llvm-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.
+    # x86_64-unknown-linux-gnu.
+    # 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
+}
+
+# Right now this is focused on arm-specific tune features.
+# We get away with this for now as one can only use x86-64 as the build host
+# (not arm).
+# Note that TUNE_FEATURES is _always_ refering to the target, so we really
+# don't want to use this for the host/build.
+def llvm_features_from_tune(d):
+    f = []
+    feat = d.getVar('TUNE_FEATURES')
+    if not feat:
+        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:
+        f.append("+vfp3")
+    if 'vfpv3d16' in feat:
+        f.append("+d16")
+
+    if 'vfpv2' in feat or 'vfp' in feat:
+        f.append("+vfp2")
+
+    if 'neon' in feat:
+        f.append("+neon")
+
+    if 'aarch64' in feat:
+        f.append("+v8")
+
+    if 'mips32' in feat:
+        f.append("+mips32")
+
+    if 'mips32r2' in feat:
+        f.append("+mips32r2")
+
+    v7=frozenset(['armv7a', 'armv7r', 'armv7m', 'armv7ve'])
+    if (not mach_overrides.isdisjoint(v7)) or (not feat.isdisjoint(v7)):
+        f.append("+v7")
+    if ('armv6' in mach_overrides) or ('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 'cortexa5' in feat:
+        f.append("+a5")
+    if 'cortexa7' in feat:
+        f.append("+a7")
+    if 'cortexa9' in feat:
+        f.append("+a9")
+    if 'cortexa15' in feat:
+        f.append("+a15")
+    if 'cortexa17' in feat:
+        f.append("+a17")
+
+    return f
+
+# TARGET_CC_ARCH changes from build/cross/target so it'll do the right thing
+# this should go away when https://github.com/rust-lang/rust/pull/31709 is
+# stable (1.9.0?)
+def llvm_features_from_cc_arch(d):
+    f = []
+    feat = d.getVar('TARGET_CC_ARCH')
+    if not feat:
+        return []
+    feat = frozenset(feat.split())
+
+    if '-mmmx' in feat:
+        f.append("+mmx")
+    if '-msse' in feat:
+        f.append("+sse")
+    if '-msse2' in feat:
+        f.append("+sse2")
+    if '-msse3' in feat:
+        f.append("+sse3")
+    if '-mssse3' in feat:
+        f.append("+ssse3")
+    if '-msse4.1' in feat:
+        f.append("+sse4.1")
+    if '-msse4.2' in feat:
+        f.append("+sse4.2")
+    if '-msse4a' in feat:
+        f.append("+sse4a")
+    if '-mavx' in feat:
+        f.append("+avx")
+    if '-mavx2' in feat:
+        f.append("+avx2")
+
+    return f
+
+def llvm_features_from_target_fpu(d):
+    # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float
+    # ABI. There is no option for hard.
+
+    fpu = d.getVar('TARGET_FPU', True)
+    return ["+soft-float"] if fpu == "soft" else []
+
+def llvm_features(d):
+    return ','.join(llvm_features_from_tune(d) +
+                    llvm_features_from_cc_arch(d) +
+                    llvm_features_from_target_fpu(d))
+
+## arm-unknown-linux-gnueabihf
+DATA_LAYOUT[arm] = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
+LLVM_TARGET[arm] = "${RUST_TARGET_SYS}"
+TARGET_ENDIAN[arm] = "little"
+TARGET_POINTER_WIDTH[arm] = "32"
+TARGET_C_INT_WIDTH[arm] = "32"
+MAX_ATOMIC_WIDTH[arm] = "64"
+FEATURES[arm] = "+v6,+vfp2"
+
+## aarch64-unknown-linux-{gnu, musl}
+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}"
+TARGET_ENDIAN[aarch64] = "little"
+TARGET_POINTER_WIDTH[aarch64] = "64"
+TARGET_C_INT_WIDTH[aarch64] = "32"
+MAX_ATOMIC_WIDTH[aarch64] = "128"
+
+## x86_64-unknown-linux-{gnu, musl}
+DATA_LAYOUT[x86_64] = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+LLVM_TARGET[x86_64] = "${RUST_TARGET_SYS}"
+TARGET_ENDIAN[x86_64] = "little"
+TARGET_POINTER_WIDTH[x86_64] = "64"
+TARGET_C_INT_WIDTH[x86_64] = "32"
+MAX_ATOMIC_WIDTH[x86_64] = "64"
+
+## i686-unknown-linux-{gnu, musl}
+DATA_LAYOUT[i686] = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128"
+LLVM_TARGET[i686] = "${RUST_TARGET_SYS}"
+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
+DATA_LAYOUT[i586] = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128"
+LLVM_TARGET[i586] = "${RUST_TARGET_SYS}"
+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}
+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"
+TARGET_POINTER_WIDTH[mips] = "32"
+TARGET_C_INT_WIDTH[mips] = "32"
+MAX_ATOMIC_WIDTH[mips] = "32"
+
+## mipsel-unknown-linux-{gnu, musl}
+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"
+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))
+
+def sys_for(d, thing):
+    return d.getVar('{}_SYS'.format(thing))
+
+def prefix_for(d, thing):
+    return d.getVar('{}_PREFIX'.format(thing))
+
+# Convert a normal arch (HOST_ARCH, TARGET_ARCH, BUILD_ARCH, etc) to something
+# rust's internals won't choke on.
+def arch_to_rust_target_arch(arch):
+    if arch == "i586" or arch == "i686":
+        return "x86"
+    elif arch == "mipsel":
+        return "mips"
+    elif arch == "mip64sel":
+        return "mips64"
+    else:
+        return arch
+
+# generates our target CPU value
+def llvm_cpu(d):
+    cpu = d.getVar('PACKAGE_ARCH')
+    target = d.getVar('TRANSLATED_TARGET_ARCH')
+
+    trans = {}
+    trans['corei7-64'] = "corei7"
+    trans['core2-32'] = "core2"
+    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())
+        if "mips32r2" in feat:
+            trans['mipsel'] = "mips32r2"
+            trans['mips'] = "mips32r2"
+        elif "mips32" in feat:
+            trans['mipsel'] = "mips32"
+            trans['mips'] = "mips32"
+
+    try:
+        return trans[cpu]
+    except:
+        return trans.get(target, "generic")
+
+TARGET_LLVM_CPU="${@llvm_cpu(d)}"
+TARGET_LLVM_FEATURES = "${@llvm_features(d)}"
+
+# class-native implies TARGET=HOST, and TUNE_FEATURES only describes the real
+# (original) target.
+TARGET_LLVM_FEATURES_class-native = "${@','.join(llvm_features_from_cc_arch(d))}"
+
+def rust_gen_target(d, thing, wd, features, cpu):
+    import json
+    from distutils.version import LooseVersion
+    arch = arch_for(d, thing)
+    sys = sys_for(d, thing)
+    prefix = prefix_for(d, thing)
+
+    features = features or d.getVarFlag('FEATURES', arch) or ""
+    features = features.strip()
+
+    # build tspec
+    tspec = {}
+    tspec['llvm-target'] = d.getVarFlag('LLVM_TARGET', arch)
+    tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch)
+    tspec['max-atomic-width'] = d.getVarFlag('MAX_ATOMIC_WIDTH', arch)
+    tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch)
+    tspec['target-c-int-width'] = d.getVarFlag('TARGET_C_INT_WIDTH', arch)
+    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['vendor'] = "unknown"
+    tspec['target-family'] = "unix"
+    tspec['linker'] = "{}{}gcc".format(d.getVar('CCACHE'), prefix)
+    tspec['ar'] = "{}ar".format(prefix)
+    tspec['cpu'] = cpu
+    if features is not "":
+        tspec['features'] = features
+    tspec['dynamic-linking'] = True
+    tspec['executables'] = True
+    tspec['linker-is-gnu'] = True
+    tspec['linker-flavor'] = "gcc"
+    tspec['has-rpath'] = True
+    tspec['has-elf-tls'] = True
+    tspec['position-independent-executables'] = True
+    tspec['panic-strategy'] = d.getVar("RUST_PANIC_STRATEGY")
+
+    # Don't use jemalloc as it doesn't work for many targets.
+    # https://github.com/rust-lang/rust/pull/37392
+    # From 1.20.0 and forward, system allocator is the default.
+    if LooseVersion(d.getVar("PV")) < LooseVersion("1.20.0"):
+        tspec['exe-allocation-crate'] = "alloc_system"
+        tspec['lib-allocation-crate'] = "alloc_system"
+
+    # write out the target spec json file
+    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")
+}
+
+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
+    done
+
+    # Some versions of rust (e.g. 1.18.0) tries to find cargo in stage0/bin/cargo
+    # and fail without it there.
+    mkdir -p ${RUSTSRC}/build/${BUILD_SYS}
+    ln -sf ${WORKDIR}/rust-snapshot/ ${RUSTSRC}/build/${BUILD_SYS}/stage0
+}
+addtask rust_setup_snapshot after do_unpack before do_configure
+do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot"
+
+
+python do_configure() {
+    import json
+    from distutils.version import LooseVersion
+    try:
+        import configparser
+    except ImportError:
+        import ConfigParser as configparser
+
+    # toml is rather similar to standard ini like format except it likes values
+    # that look more JSON like. So for our purposes simply escaping all values
+    # as JSON seem to work fine.
+
+    e = lambda s: json.dumps(s)
+
+    config = configparser.RawConfigParser()
+
+    # [target.ARCH-poky-linux]
+    target_section = "target.{}".format(d.getVar('TARGET_SYS', True))
+    config.add_section(target_section)
+
+    llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}")
+    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))
+
+    # Whether or not to optimize the compiler and standard library
+    config.set("rust", "optimize", e(True))
+
+    # [build]
+    config.add_section("build")
+    config.set("build", "submodules", e(False))
+    config.set("build", "docs", e(False))
+
+    rustc = d.expand("${WORKDIR}/rust-snapshot/bin/rustc")
+    config.set("build", "rustc", e(rustc))
+
+    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)))
+
+    with open("config.toml", "w") as f:
+        config.write(f)
+
+    # set up ${WORKDIR}/cargo_home
+    bb.build.exec_func("setup_cargo_environment", d)
+}
+
+
+rust_runx () {
+    echo "COMPILE ${PN}" "$@"
+
+    # CFLAGS, LDFLAGS, CXXFLAGS, CPPFLAGS are used by rust's build for a
+    # wide range of targets (not just TARGET). Yocto's settings for them will
+    # be inappropriate, avoid using.
+    unset CFLAGS
+    unset LDFLAGS
+    unset CXXFLAGS
+    unset CPPFLAGS
+
+    oe_cargo_fix_env
+
+    python3 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
+
+    # Install our custom target.json files
+    local td="${D}${libdir}/rustlib/"
+    install -d "$td"
+    for tgt in "${WORKDIR}/targets/"* ; do
+        install -m 0644 "$tgt" "$td"
+    done
+
+    # cleanup after rust-installer since we don't need these bits
+    rm ${D}/${libdir}/rustlib/install.log
+    rm ${D}/${libdir}/rustlib/rust-installer-version
+    rm ${D}/${libdir}/rustlib/uninstall.sh
+    rm ${D}/${libdir}/rustlib/components
+}
+
+
+do_install () {
+    rust_do_install
+}
+# ex: sts=4 et sw=4 ts=8

recipes-devtools/rust/rust_1.34.2.bb

@@ -0,0 +1,12 @@
+require rust.inc
+require rust-source-${PV}.inc
+require rust-snapshot-${PV}.inc
+
+DEPENDS += "rust-llvm (=${PV})"
+
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
+
+BBCLASSEXTEND = "native"

recipes-devtools/rust/rust_1.36.0.bb

@@ -0,0 +1,12 @@
+require rust.inc
+require rust-source-${PV}.inc
+require rust-snapshot-${PV}.inc
+
+DEPENDS += "rust-llvm (=${PV})"
+
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
+
+BBCLASSEXTEND = "native"

recipes-devtools/rust/rust_1.37.0.bb

@@ -0,0 +1,12 @@
+require rust.inc
+require rust-source-${PV}.inc
+require rust-snapshot-${PV}.inc
+
+DEPENDS += "rust-llvm (=${PV})"
+
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
+
+BBCLASSEXTEND = "native"

recipes-devtools/rust/rust_1.39.0.bb

@@ -0,0 +1,12 @@
+require rust.inc
+require rust-source-${PV}.inc
+require rust-snapshot-${PV}.inc
+
+DEPENDS += "rust-llvm (=${PV})"
+
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
+
+BBCLASSEXTEND = "native"

recipes-devtools/rust/rust_1.40.0.bb

@@ -0,0 +1,12 @@
+require rust.inc
+require rust-source-${PV}.inc
+require rust-snapshot-${PV}.inc
+
+DEPENDS += "rust-llvm (=${PV})"
+
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
+
+BBCLASSEXTEND = "native"

recipes-devtools/rust/rust_1.41.0.bb

@@ -0,0 +1,12 @@
+require rust.inc
+require rust-source-${PV}.inc
+require rust-snapshot-${PV}.inc
+
+DEPENDS += "rust-llvm (=${PV})"
+
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_RUST_DEPS_class-native = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES_class-native = "virtual/${TARGET_PREFIX}rust"
+
+BBCLASSEXTEND = "native"

recipes-example/rustfmt/rustfmt_1.4.2.bb

@@ -0,0 +1,171 @@
+# Auto-Generated by cargo-bitbake 0.3.13
+#
+inherit cargo
+
+# If this is git based prefer versioned ones if they exist
+# DEFAULT_PREFERENCE = "-1"
+
+# how to get rustfmt-nightly could be as easy as but default to a git checkout:
+# SRC_URI += "crate://crates.io/rustfmt-nightly/1.4.2"
+SRC_URI += "git://github.com/rust-lang/rustfmt/;protocol=https;nobranch=1"
+SRCREV = "aeb3496f31a0dfa90fc511520d2023634e885260"
+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/aho-corasick/0.7.4 \
+    crate://crates.io/annotate-snippets/0.6.1 \
+    crate://crates.io/ansi_term/0.11.0 \
+    crate://crates.io/argon2rs/0.2.5 \
+    crate://crates.io/arrayvec/0.4.11 \
+    crate://crates.io/atty/0.2.13 \
+    crate://crates.io/autocfg/0.1.5 \
+    crate://crates.io/backtrace-sys/0.1.31 \
+    crate://crates.io/backtrace/0.3.33 \
+    crate://crates.io/bitflags/1.1.0 \
+    crate://crates.io/blake2-rfc/0.2.18 \
+    crate://crates.io/bstr/0.2.6 \
+    crate://crates.io/bytecount/0.5.1 \
+    crate://crates.io/byteorder/1.3.2 \
+    crate://crates.io/c2-chacha/0.2.2 \
+    crate://crates.io/cargo_metadata/0.8.1 \
+    crate://crates.io/cc/1.0.38 \
+    crate://crates.io/cfg-if/0.1.9 \
+    crate://crates.io/clap/2.33.0 \
+    crate://crates.io/cloudabi/0.0.3 \
+    crate://crates.io/constant_time_eq/0.1.3 \
+    crate://crates.io/crossbeam-channel/0.3.9 \
+    crate://crates.io/crossbeam-deque/0.2.0 \
+    crate://crates.io/crossbeam-epoch/0.3.1 \
+    crate://crates.io/crossbeam-utils/0.2.2 \
+    crate://crates.io/crossbeam-utils/0.6.6 \
+    crate://crates.io/derive-new/0.5.7 \
+    crate://crates.io/diff/0.1.11 \
+    crate://crates.io/dirs-sys/0.3.3 \
+    crate://crates.io/dirs/2.0.1 \
+    crate://crates.io/either/1.5.2 \
+    crate://crates.io/ena/0.13.0 \
+    crate://crates.io/env_logger/0.6.2 \
+    crate://crates.io/failure/0.1.5 \
+    crate://crates.io/failure_derive/0.1.5 \
+    crate://crates.io/fnv/1.0.6 \
+    crate://crates.io/fuchsia-cprng/0.1.1 \
+    crate://crates.io/getopts/0.2.19 \
+    crate://crates.io/getrandom/0.1.6 \
+    crate://crates.io/globset/0.4.4 \
+    crate://crates.io/heck/0.3.1 \
+    crate://crates.io/humantime/1.2.0 \
+    crate://crates.io/ignore/0.4.8 \
+    crate://crates.io/indexmap/1.0.2 \
+    crate://crates.io/itertools/0.8.0 \
+    crate://crates.io/itoa/0.4.4 \
+    crate://crates.io/jobserver/0.1.16 \
+    crate://crates.io/lazy_static/1.3.0 \
+    crate://crates.io/libc/0.2.60 \
+    crate://crates.io/lock_api/0.1.5 \
+    crate://crates.io/log/0.4.7 \
+    crate://crates.io/memchr/2.2.1 \
+    crate://crates.io/memoffset/0.2.1 \
+    crate://crates.io/nodrop/0.1.13 \
+    crate://crates.io/num_cpus/1.10.1 \
+    crate://crates.io/owning_ref/0.4.0 \
+    crate://crates.io/packed_simd/0.3.3 \
+    crate://crates.io/parking_lot/0.7.1 \
+    crate://crates.io/parking_lot_core/0.4.0 \
+    crate://crates.io/ppv-lite86/0.2.5 \
+    crate://crates.io/proc-macro2/0.4.30 \
+    crate://crates.io/quick-error/1.2.2 \
+    crate://crates.io/quote/0.6.13 \
+    crate://crates.io/rand/0.6.5 \
+    crate://crates.io/rand/0.7.0 \
+    crate://crates.io/rand_chacha/0.1.1 \
+    crate://crates.io/rand_chacha/0.2.1 \
+    crate://crates.io/rand_core/0.3.1 \
+    crate://crates.io/rand_core/0.4.0 \
+    crate://crates.io/rand_core/0.5.0 \
+    crate://crates.io/rand_hc/0.1.0 \
+    crate://crates.io/rand_hc/0.2.0 \
+    crate://crates.io/rand_isaac/0.1.1 \
+    crate://crates.io/rand_jitter/0.1.4 \
+    crate://crates.io/rand_os/0.1.3 \
+    crate://crates.io/rand_pcg/0.1.2 \
+    crate://crates.io/rand_xorshift/0.1.1 \
+    crate://crates.io/rdrand/0.4.0 \
+    crate://crates.io/redox_syscall/0.1.56 \
+    crate://crates.io/redox_users/0.3.0 \
+    crate://crates.io/regex-syntax/0.6.10 \
+    crate://crates.io/regex/1.2.0 \
+    crate://crates.io/rustc-ap-arena/542.0.0 \
+    crate://crates.io/rustc-ap-graphviz/542.0.0 \
+    crate://crates.io/rustc-ap-rustc_data_structures/542.0.0 \
+    crate://crates.io/rustc-ap-rustc_errors/542.0.0 \
+    crate://crates.io/rustc-ap-rustc_lexer/542.0.0 \
+    crate://crates.io/rustc-ap-rustc_macros/542.0.0 \
+    crate://crates.io/rustc-ap-rustc_target/542.0.0 \
+    crate://crates.io/rustc-ap-serialize/542.0.0 \
+    crate://crates.io/rustc-ap-syntax/542.0.0 \
+    crate://crates.io/rustc-ap-syntax_pos/542.0.0 \
+    crate://crates.io/rustc-demangle/0.1.15 \
+    crate://crates.io/rustc-hash/1.0.1 \
+    crate://crates.io/rustc-rayon-core/0.2.0 \
+    crate://crates.io/rustc-rayon/0.2.0 \
+    crate://crates.io/rustc-workspace-hack/1.0.0 \
+    crate://crates.io/rustc_version/0.2.3 \
+    crate://crates.io/ryu/1.0.0 \
+    crate://crates.io/same-file/1.0.5 \
+    crate://crates.io/scoped-tls/1.0.0 \
+    crate://crates.io/scoped_threadpool/0.1.9 \
+    crate://crates.io/scopeguard/0.3.3 \
+    crate://crates.io/semver-parser/0.7.0 \
+    crate://crates.io/semver/0.9.0 \
+    crate://crates.io/serde/1.0.97 \
+    crate://crates.io/serde_derive/1.0.97 \
+    crate://crates.io/serde_json/1.0.40 \
+    crate://crates.io/smallvec/0.6.10 \
+    crate://crates.io/spin/0.5.0 \
+    crate://crates.io/stable_deref_trait/1.1.1 \
+    crate://crates.io/strsim/0.8.0 \
+    crate://crates.io/structopt-derive/0.2.18 \
+    crate://crates.io/structopt/0.2.18 \
+    crate://crates.io/syn/0.15.42 \
+    crate://crates.io/synstructure/0.10.2 \
+    crate://crates.io/term/0.6.0 \
+    crate://crates.io/termcolor/1.0.5 \
+    crate://crates.io/textwrap/0.11.0 \
+    crate://crates.io/thread_local/0.3.6 \
+    crate://crates.io/toml/0.5.1 \
+    crate://crates.io/ucd-util/0.1.5 \
+    crate://crates.io/unicode-segmentation/1.3.0 \
+    crate://crates.io/unicode-width/0.1.5 \
+    crate://crates.io/unicode-xid/0.1.0 \
+    crate://crates.io/unicode_categories/0.1.1 \
+    crate://crates.io/utf8-ranges/1.0.3 \
+    crate://crates.io/vec_map/0.8.1 \
+    crate://crates.io/walkdir/2.2.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.2 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.7 \
+    crate://crates.io/wincolor/1.0.1 \
+"
+
+
+
+# FIXME: update generateme with the real MD5 of the license file
+LIC_FILES_CHKSUM = " \
+    file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+    file://LICENSE-MIT;md5=0b29d505d9225d1f0815cbdcf602b901 \
+"
+
+SUMMARY = "Tool to find and fix Rust formatting issues"
+HOMEPAGE = "https://github.com/rust-lang/rustfmt"
+LICENSE = "Apache-2.0 | MIT"
+
+# 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 rustfmt-nightly-${PV}.inc
+include rustfmt-nightly.inc

recipes/cargo/cargo.inc

@@ -1,74 +0,0 @@
-INHIBIT_CARGO_DEP = "1"
-
-inherit cargo
-inherit patch
-inherit rust-installer
-
-SUMMARY = "Cargo downloads your Rust project's dependencies and builds your project"
-HOMEPAGE = "http://crates.io"
-SECTION = "devel"
-LICENSE = "MIT | Apache-2.0"
-
-DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2"
-
-SRC_URI = "\
-	git://github.com/rust-lang/cargo.git;protocol=https;name=cargo \
-	git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=git/src/rust-installer \
-	http://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${CARGO_SNAPSHOT} \
-"
-
-LIC_FILES_CHKSUM ="\
-	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
-	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
-	file://LICENSE-THIRD-PARTY;md5=afbb7ae0aa70c8e437a007314eae5f3b \
-"
-SRCREV_FORMAT = "cargo_rust-installer"
-PV .= "+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-PACKAGECONFIG ??= ""
-
-# Note: this does not appear to work very well due to our use of bitbake triples
-# & rust's use of cooked triples
-PACKAGECONFIG[rust-snapshot] = "--local-rust-root=${B}/rustc"
-
-do_configure () {
-	${@bb.utils.contains('PACKAGECONFIG', 'rust-snapshot', '${S}/.travis.install.deps.sh', ':', d)}
-
-	"${S}/configure" \
-		"--prefix=${prefix}"			\
-		"--build=${BUILD_SYS}"			\
-		"--host=${HOST_SYS}"			\
-		"--target=${TARGET_SYS}"		\
-		"--localstatedir=${localstatedir}"	\
-		"--sysconfdir=${sysconfdir}"		\
-		"--datadir=${datadir}"			\
-		"--infodir=${infodir}"			\
-		"--mandir=${mandir}"			\
-		"--libdir=${libdir}"			\
-		"--disable-verify-install"		\
-		${EXTRA_OECONF} \
-		|| die "Could not configure cargo"
-
-	# cargo downloads a cargo snapshot to build itself using cargo, we need
-	# to override it's arch info.
-	cargo_do_configure
-}
-
-do_compile () {
-	oe_cargo_fix_env
-
-	rm -rf target/snapshot
-	mkdir -p target
-	cp -R ${WORKDIR}/$(basename ${CARGO_SNAPSHOT} .tar.gz) target/snapshot
-
-	oe_runmake ARGS="--verbose"
-}
-
-do_install () {
-	oe_runmake DESTDIR="${D}" install
-}
-
-BBCLASSEXTEND = "native"

recipes/cargo/cargo_git.bb

@@ -1,51 +0,0 @@
-# 2015-06-29
-SRCREV_cargo = "339a103fa71701541229316a568fca12cf07fc8d"
-SRCREV_rust-installer = "8e4f8ea581502a2edc8177a040300e05ff7f91e3"
-
-require cargo.inc
-
-SRC_URI += " \
-	git://github.com/carllerche/curl-rust.git;protocol=https;destsuffix=curl-rust;name=curl-rust \
-	file://curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch;patchdir=../curl-rust \
-	file://curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch;patchdir=../curl-rust \
-\
-	git://github.com/alexcrichton/ssh2-rs.git;protocol=https;name=ssh2-rs;destsuffix=ssh2-rs \
-	file://ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch;patchdir=../ssh2-rs \
-\
-	git://github.com/alexcrichton/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \
-	file://git2-rs/0001-Add-generic-openssl-sys-dep.patch;patchdir=../git2-rs \
-"
-
-# 0.2.10  / -sys 0.1.24
-SRCREV_curl-rust = "9fbf39fa8765e777d110ad18a2a2a3ea42dcb717"
-
-# 0.2.8 / -sys 0.1.25
-SRCREV_ssh2-rs = "afc39c6e7236b87d7ebde21ee4d4743d9437b85f"
-
-# 0.2.11 / -sys 0.2.14
-SRCREV_git2-rs = "3a7a990607a766fa65a40b920d70c8289691d2f8"
-
-SRCREV_FORMAT .= "_curl-rust_curl_ssh2-rs_git2-rs"
-EXTRA_OECARGO_PATHS = "\
-	${WORKDIR}/curl-rust \
-	${WORKDIR}/ssh2-rs \
-	${WORKDIR}/git2-rs \
-"
-
-CARGO_SNAPSHOT = "2015-04-02/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
-SRC_URI[md5sum] = "3d62194d02a9088cd8aae379e9498134"
-SRC_URI[sha256sum] = "16b6338ba2942989693984ba4dbd057c2801e8805e6da8fa7b781b00e722d117"
-
-# Used in libgit2-sys's build.rs, needed for pkg-config to be used
-export LIBGIT2_SYS_USE_PKG_CONFIG = "1"
-
-# FIXME: we don't actually use these, and shouldn't need to fetch it, but not having it results in:
-## target/snapshot/bin/cargo build --target x86_64-linux  --verbose 
-## Failed to resolve path '/home/cody/obj/y/tmp/work/x86_64-linux/cargo-native/git+gitAUTOINC+0b84923203_9181ea8f4e_8baa8ccb39-r0/curl-rust/curl-sys/curl/.git': No such file or directory
-
-SRC_URI += "\
-	git://github.com/alexcrichton/curl.git;protocol=https;destsuffix=curl-rust/curl-sys/curl;name=curl;branch=configure \
-	git://github.com/libgit2/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2 \
-"
-SRCREV_curl = "9a300aa13e5035a795396e429aa861229424c9dc"
-SRCREV_libgit2 = "47f37400253210f483d84fb9c2ecf44fb5986849"

recipes/cargo/files/0001-update-Rust.patch

@@ -1,906 +0,0 @@
-From d122d57536df9fbfcdfda08b2918dc6e0c6209c0 Mon Sep 17 00:00:00 2001
-From: Andrew Paseltiner <apaseltiner@gmail.com>
-Date: Thu, 12 Feb 2015 23:10:07 -0500
-Subject: [PATCH] update Rust
-
----
- Cargo.lock                               | 32 ++++++++++++------------
- src/bin/build.rs                         |  4 +--
- src/bin/cargo.rs                         |  2 +-
- src/bin/clean.rs                         |  4 +--
- src/bin/generate_lockfile.rs             |  4 +--
- src/bin/new.rs                           |  4 +--
- src/bin/update.rs                        |  4 +--
- src/bin/verify_project.rs                |  4 +--
- src/bin/version.rs                       |  4 +--
- src/cargo/lib.rs                         |  2 +-
- src/cargo/ops/cargo_new.rs               |  4 +--
- src/cargo/ops/cargo_rustc/engine.rs      |  2 +-
- src/cargo/ops/registry.rs                |  4 +--
- src/cargo/sources/git/utils.rs           |  3 ++-
- src/cargo/util/config.rs                 |  2 +-
- src/cargo/util/hex.rs                    |  5 ++--
- src/cargo/util/profile.rs                |  2 +-
- src/rustversion.txt                      |  2 +-
- tests/support/mod.rs                     |  2 +-
- tests/test_cargo.rs                      |  2 +-
- tests/test_cargo_compile.rs              | 10 ++++----
- tests/test_cargo_compile_custom_build.rs | 42 ++++++++++++++++----------------
- tests/test_cargo_compile_git_deps.rs     | 24 +++++++++---------
- tests/test_cargo_compile_plugins.rs      |  6 ++---
- tests/test_cargo_cross_compile.rs        | 28 ++++++++++-----------
- tests/test_cargo_profiles.rs             |  6 ++---
- 26 files changed, 103 insertions(+), 105 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 14dd876..629585c 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4,7 +4,7 @@ version = "0.1.0"
- dependencies = [
-  "advapi32-sys 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "curl 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-- "docopt 0.6.36 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "docopt 0.6.37 (registry+https://github.com/rust-lang/crates.io-index)",
-  "env_logger 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "flate2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "git2 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -18,8 +18,8 @@ dependencies = [
-  "semver 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tar 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "term 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-- "toml 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-  "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-@@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "curl-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -55,13 +55,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
- name = "docopt"
--version = "0.6.36"
-+version = "0.6.37"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "regex 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -97,7 +97,7 @@ version = "0.1.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libgit2-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libgit2-sys 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-  "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -136,13 +136,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "libgit2-sys"
--version = "0.1.12"
-+version = "0.1.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "libssh2-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -159,7 +159,7 @@ version = "0.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -192,12 +192,12 @@ dependencies = [
- 
- [[package]]
- name = "openssl-sys"
--version = "0.3.3"
-+version = "0.3.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-- "pkg-config 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -207,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "pkg-config"
--version = "0.2.0"
-+version = "0.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
-@@ -255,7 +255,7 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.1.16"
-+version = "0.1.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -264,7 +264,7 @@ dependencies = [
- 
- [[package]]
- name = "toml"
--version = "0.1.16"
-+version = "0.1.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
-diff --git a/src/bin/build.rs b/src/bin/build.rs
-index a617f64..0784c04 100644
---- a/src/bin/build.rs
-+++ b/src/bin/build.rs
-@@ -1,4 +1,4 @@
--use std::os;
-+use std::env;
- 
- use cargo::ops::CompileOptions;
- use cargo::ops;
-@@ -47,7 +47,7 @@ the --release flag will use the `release` profile instead.
- ";
- 
- pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
--    debug!("executing; cmd=cargo-build; args={:?}", os::args());
-+    debug!("executing; cmd=cargo-build; args={:?}", env::args().collect::<Vec<_>>());
-     config.shell().set_verbose(options.flag_verbose);
- 
-     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
-diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
-index 7bf0a11..53c904d 100644
---- a/src/bin/cargo.rs
-+++ b/src/bin/cargo.rs
-@@ -245,7 +245,7 @@ fn list_command_directory() -> Vec<Path> {
-         dirs.push(path.join("../lib/cargo"));
-         dirs.push(path);
-     }
--    if let Some(val) = env::var("PATH") {
-+    if let Some(val) = env::var_os("PATH") {
-         dirs.extend(env::split_paths(&val));
-     }
-     dirs
-diff --git a/src/bin/clean.rs b/src/bin/clean.rs
-index dcc013e..a530b9b 100644
---- a/src/bin/clean.rs
-+++ b/src/bin/clean.rs
-@@ -1,4 +1,4 @@
--use std::os;
-+use std::env;
- 
- use cargo::ops;
- use cargo::util::{CliResult, CliError, Config};
-@@ -33,7 +33,7 @@ and its format, see the `cargo help pkgid` command.
- 
- pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
-     config.shell().set_verbose(options.flag_verbose);
--    debug!("executing; cmd=cargo-clean; args={:?}", os::args());
-+    debug!("executing; cmd=cargo-clean; args={:?}", env::args().collect::<Vec<_>>());
- 
-     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
-     let opts = ops::CleanOptions {
-diff --git a/src/bin/generate_lockfile.rs b/src/bin/generate_lockfile.rs
-index a350ab6..d9777ef 100644
---- a/src/bin/generate_lockfile.rs
-+++ b/src/bin/generate_lockfile.rs
-@@ -1,4 +1,4 @@
--use std::os;
-+use std::env;
- 
- use cargo::ops;
- use cargo::util::{CliResult, CliError, Config};
-@@ -23,7 +23,7 @@ Options:
- ";
- 
- pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
--    debug!("executing; cmd=cargo-generate-lockfile; args={:?}", os::args());
-+    debug!("executing; cmd=cargo-generate-lockfile; args={:?}", env::args().collect::<Vec<_>>());
-     config.shell().set_verbose(options.flag_verbose);
-     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
- 
-diff --git a/src/bin/new.rs b/src/bin/new.rs
-index 4126e38..0abff6a 100644
---- a/src/bin/new.rs
-+++ b/src/bin/new.rs
-@@ -1,4 +1,4 @@
--use std::os;
-+use std::env;
- 
- use cargo::ops;
- use cargo::util::{CliResult, CliError, Config};
-@@ -28,7 +28,7 @@ Options:
- ";
- 
- pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
--    debug!("executing; cmd=cargo-new; args={:?}", os::args());
-+    debug!("executing; cmd=cargo-new; args={:?}", env::args().collect::<Vec<_>>());
-     config.shell().set_verbose(options.flag_verbose);
- 
-     let Options { flag_bin, arg_path, flag_vcs, .. } = options;
-diff --git a/src/bin/update.rs b/src/bin/update.rs
-index fa75506..4fdeebf 100644
---- a/src/bin/update.rs
-+++ b/src/bin/update.rs
-@@ -1,4 +1,4 @@
--use std::os;
-+use std::env;
- 
- use cargo::ops;
- use cargo::util::{CliResult, CliError, Config};
-@@ -49,7 +49,7 @@ For more information about package id specifications, see `cargo help pkgid`.
- ";
- 
- pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
--    debug!("executing; cmd=cargo-update; args={:?}", os::args());
-+    debug!("executing; cmd=cargo-update; args={:?}", env::args().collect::<Vec<_>>());
-     config.shell().set_verbose(options.flag_verbose);
-     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
- 
-diff --git a/src/bin/verify_project.rs b/src/bin/verify_project.rs
-index 54f8d6e..816c5e9 100644
---- a/src/bin/verify_project.rs
-+++ b/src/bin/verify_project.rs
-@@ -1,8 +1,8 @@
- extern crate toml;
- 
- use std::collections::HashMap;
-+use std::env;
- use std::old_io::File;
--use std::os;
- 
- use cargo::util::{CliResult, Config};
- 
-@@ -47,6 +47,6 @@ pub fn execute(args: Flags, config: &Config) -> CliResult<Option<Error>> {
- fn fail(reason: &str, value: &str) -> CliResult<Option<Error>>{
-     let mut h = HashMap::new();
-     h.insert(reason.to_string(), value.to_string());
--    os::set_exit_status(1);
-+    env::set_exit_status(1);
-     Ok(Some(h))
- }
-diff --git a/src/bin/version.rs b/src/bin/version.rs
-index e1bc011..b5622f2 100644
---- a/src/bin/version.rs
-+++ b/src/bin/version.rs
-@@ -1,4 +1,4 @@
--use std::os;
-+use std::env;
- 
- use cargo;
- use cargo::util::{CliResult, Config};
-@@ -16,7 +16,7 @@ Options:
- ";
- 
- pub fn execute(_: Options, _: &Config) -> CliResult<Option<()>> {
--    debug!("executing; cmd=cargo-version; args={:?}", os::args());
-+    debug!("executing; cmd=cargo-version; args={:?}", env::args().collect::<Vec<_>>());
- 
-     println!("{}", cargo::version());
- 
-diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
-index 609e1bd..d5737ef 100644
---- a/src/cargo/lib.rs
-+++ b/src/cargo/lib.rs
-@@ -95,7 +95,7 @@ fn process<V, F>(mut callback: F)
-     let mut shell = shell(true);
-     process_executed((|| {
-         let config = try!(Config::new(&mut shell));
--        let args: Vec<_> = try!(env::args().map(|s| {
-+        let args: Vec<_> = try!(env::args_os().map(|s| {
-             s.into_string().map_err(|s| {
-                 human(format!("invalid unicode in argument: {:?}", s))
-             })
-diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
-index 09d8318..ae9d5e5 100644
---- a/src/cargo/ops/cargo_new.rs
-+++ b/src/cargo/ops/cargo_new.rs
-@@ -134,8 +134,8 @@ fn discover_author() -> CargoResult<(String, Option<String>)> {
-     let git_config = git_config.as_ref();
-     let name = git_config.and_then(|g| g.get_str("user.name").ok())
-                          .map(|s| s.to_string())
--                         .or_else(|| env::var_string("USER").ok())      // unix
--                         .or_else(|| env::var_string("USERNAME").ok()); // windows
-+                         .or_else(|| env::var("USER").ok())      // unix
-+                         .or_else(|| env::var("USERNAME").ok()); // windows
-     let name = match name {
-         Some(name) => name,
-         None => {
-diff --git a/src/cargo/ops/cargo_rustc/engine.rs b/src/cargo/ops/cargo_rustc/engine.rs
-index 5c6a0ef..9d234f8 100644
---- a/src/cargo/ops/cargo_rustc/engine.rs
-+++ b/src/cargo/ops/cargo_rustc/engine.rs
-@@ -85,7 +85,7 @@ impl CommandPrototype {
- 
-     pub fn get_env(&self, var: &str) -> Option<CString> {
-         self.env.get(var).cloned().or_else(|| {
--            Some(env::var_string(var).ok().map(|s| CString::from_vec(s.into_bytes())))
-+            Some(env::var(var).ok().map(|s| CString::from_vec(s.into_bytes())))
-         }).and_then(|val| val)
-     }
- 
-diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
-index 2461981..59754f2 100644
---- a/src/cargo/ops/registry.rs
-+++ b/src/cargo/ops/registry.rs
-@@ -191,7 +191,7 @@ pub fn http_proxy(config: &Config) -> CargoResult<Option<String>> {
-         }
-         Err(..) => {}
-     }
--    Ok(env::var_string("HTTP_PROXY").ok())
-+    Ok(env::var("HTTP_PROXY").ok())
- }
- 
- pub fn http_timeout(config: &Config) -> CargoResult<Option<i64>> {
-@@ -199,7 +199,7 @@ pub fn http_timeout(config: &Config) -> CargoResult<Option<i64>> {
-         Some((s, _)) => return Ok(Some(s)),
-         None => {}
-     }
--    Ok(env::var_string("HTTP_TIMEOUT").ok().and_then(|s| s.parse().ok()))
-+    Ok(env::var("HTTP_TIMEOUT").ok().and_then(|s| s.parse().ok()))
- }
- 
- pub fn registry_login(config: &Config, token: String) -> CargoResult<()> {
-diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs
-index 898f082..9861ed6 100644
---- a/src/cargo/sources/git/utils.rs
-+++ b/src/cargo/sources/git/utils.rs
-@@ -308,7 +308,8 @@ impl<'a> GitCheckout<'a> {
-                 // as the submodule's head, then we can bail out and go to the
-                 // next submodule.
-                 let head_and_repo = child.open().and_then(|repo| {
--                    Ok((try!(repo.head()).target(), repo))
-+                    let target = try!(repo.head()).target();
-+                    Ok((target, repo))
-                 });
-                 let repo = match head_and_repo {
-                     Ok((head, repo)) => {
-diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
-index 217d028..076e68d 100644
---- a/src/cargo/util/config.rs
-+++ b/src/cargo/util/config.rs
-@@ -380,7 +380,7 @@ impl ConfigValue {
- }
- 
- fn homedir() -> Option<Path> {
--    let cargo_home = env::var_string("CARGO_HOME").map(|p| Path::new(p)).ok();
-+    let cargo_home = env::var("CARGO_HOME").map(|p| Path::new(p)).ok();
-     let user_home = env::home_dir().map(|p| p.join(".cargo"));
-     return cargo_home.or(user_home);
- }
-diff --git a/src/cargo/util/hex.rs b/src/cargo/util/hex.rs
-index 2bce7ea..3e8d962 100644
---- a/src/cargo/util/hex.rs
-+++ b/src/cargo/util/hex.rs
-@@ -1,12 +1,11 @@
--use std::old_io::MemWriter;
- use std::hash::{Hasher, Hash, SipHasher};
- 
- use rustc_serialize::hex::ToHex;
- 
- pub fn to_hex(num: u64) -> String {
--    let mut writer = MemWriter::with_capacity(8);
-+    let mut writer = Vec::with_capacity(8);
-     writer.write_le_u64(num).unwrap(); // this should never fail
--    writer.get_ref().to_hex()
-+    writer.to_hex()
- }
- 
- pub fn short_hash<H: Hash<SipHasher>>(hashable: &H) -> String {
-diff --git a/src/cargo/util/profile.rs b/src/cargo/util/profile.rs
-index 9d19c36..100fd2c 100644
---- a/src/cargo/util/profile.rs
-+++ b/src/cargo/util/profile.rs
-@@ -14,7 +14,7 @@ pub struct Profiler {
-     desc: String,
- }
- 
--fn enabled() -> bool { env::var("CARGO_PROFILE").is_some() }
-+fn enabled() -> bool { env::var_os("CARGO_PROFILE").is_some() }
- 
- pub fn start<T: fmt::Display>(desc: T) -> Profiler {
-     if !enabled() { return Profiler { desc: String::new() } }
-diff --git a/src/rustversion.txt b/src/rustversion.txt
-index e2a057d..17cae77 100644
---- a/src/rustversion.txt
-+++ b/src/rustversion.txt
-@@ -1 +1 @@
--2015-02-09
-+2015-02-12
-diff --git a/tests/support/mod.rs b/tests/support/mod.rs
-index 83be295..7c10756 100644
---- a/tests/support/mod.rs
-+++ b/tests/support/mod.rs
-@@ -227,7 +227,7 @@ impl<T, E: fmt::Display> ErrMsg<T> for Result<T, E> {
- 
- // Path to cargo executables
- pub fn cargo_dir() -> Path {
--    env::var_string("CARGO_BIN_PATH").map(Path::new).ok()
-+    env::var("CARGO_BIN_PATH").map(Path::new).ok()
-         .or_else(|| env::current_exe().ok().map(|s| s.dir_path()))
-         .unwrap_or_else(|| {
-             panic!("CARGO_BIN_PATH wasn't set. Cannot continue running test")
-diff --git a/tests/test_cargo.rs b/tests/test_cargo.rs
-index b4b1abd..64e4c75 100644
---- a/tests/test_cargo.rs
-+++ b/tests/test_cargo.rs
-@@ -25,7 +25,7 @@ fn fake_executable(proj: ProjectBuilder, dir: &Path, name: &str) -> ProjectBuild
- }
- 
- fn path() -> Vec<Path> {
--    env::split_paths(&env::var("PATH").unwrap_or(OsString::new())).collect()
-+    env::split_paths(&env::var_os("PATH").unwrap_or(OsString::new())).collect()
- }
- 
- test!(list_commands_looks_at_path {
-diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
-index 20fcab8..9c5b934 100644
---- a/tests/test_cargo_compile.rs
-+++ b/tests/test_cargo_compile.rs
-@@ -1259,7 +1259,7 @@ test!(freshness_ignores_excluded {
-             exclude = ["src/b*.rs"]
-         "#)
-         .file("build.rs", "fn main() {}")
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }");
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }");
-     foo.build();
-     foo.root().move_into_the_past().unwrap();
- 
-@@ -1297,15 +1297,15 @@ test!(rebuild_preserves_out_dir {
-             use std::old_io::File;
- 
-             fn main() {
--                let path = Path::new(env::var_string("OUT_DIR").unwrap()).join("foo");
--                if env::var("FIRST").is_some() {
-+                let path = Path::new(env::var("OUT_DIR").unwrap()).join("foo");
-+                if env::var_os("FIRST").is_some() {
-                     File::create(&path).unwrap();
-                 } else {
-                     File::create(&path).unwrap();
-                 }
-             }
-         "#)
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }");
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }");
-     foo.build();
-     foo.root().move_into_the_past().unwrap();
- 
-@@ -1335,7 +1335,7 @@ test!(dep_no_libs {
-             [dependencies.bar]
-             path = "bar"
-         "#)
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }")
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }")
-         .file("bar/Cargo.toml", r#"
-             [package]
-             name = "bar"
-diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs
-index b110b86..4ef727b 100644
---- a/tests/test_cargo_compile_custom_build.rs
-+++ b/tests/test_cargo_compile_custom_build.rs
-@@ -79,32 +79,32 @@ test!(custom_build_env_vars {
-             use std::env;
-             use std::old_io::fs::PathExtensions;
-             fn main() {{
--                let _target = env::var_string("TARGET").unwrap();
-+                let _target = env::var("TARGET").unwrap();
- 
--                let _ncpus = env::var_string("NUM_JOBS").unwrap();
-+                let _ncpus = env::var("NUM_JOBS").unwrap();
- 
--                let out = env::var_string("CARGO_MANIFEST_DIR").unwrap();
-+                let out = env::var("CARGO_MANIFEST_DIR").unwrap();
-                 let p1 = Path::new(out);
-                 let cwd = env::current_dir().unwrap();
-                 let p2 = cwd.join(Path::new(file!()).dir_path().dir_path());
-                 assert!(p1 == p2, "{{}} != {{}}", p1.display(), p2.display());
- 
--                let opt = env::var_string("OPT_LEVEL").unwrap();
-+                let opt = env::var("OPT_LEVEL").unwrap();
-                 assert_eq!(opt.as_slice(), "0");
- 
--                let opt = env::var_string("PROFILE").unwrap();
-+                let opt = env::var("PROFILE").unwrap();
-                 assert_eq!(opt.as_slice(), "compile");
- 
--                let debug = env::var_string("DEBUG").unwrap();
-+                let debug = env::var("DEBUG").unwrap();
-                 assert_eq!(debug.as_slice(), "true");
- 
--                let out = env::var_string("OUT_DIR").unwrap();
-+                let out = env::var("OUT_DIR").unwrap();
-                 assert!(out.as_slice().starts_with(r"{0}"));
-                 assert!(Path::new(out).is_dir());
- 
--                let _host = env::var_string("HOST").unwrap();
-+                let _host = env::var("HOST").unwrap();
- 
--                let _feat = env::var_string("CARGO_FEATURE_FOO").unwrap();
-+                let _feat = env::var("CARGO_FEATURE_FOO").unwrap();
-             }}
-         "#,
-         p.root().join("target").join("build").display());
-@@ -269,8 +269,8 @@ test!(overrides_and_links {
-         .file("build.rs", r#"
-             use std::env;
-             fn main() {
--                assert_eq!(env::var_string("DEP_FOO_FOO").unwrap().as_slice(), "bar");
--                assert_eq!(env::var_string("DEP_FOO_BAR").unwrap().as_slice(), "baz");
-+                assert_eq!(env::var("DEP_FOO_FOO").unwrap().as_slice(), "bar");
-+                assert_eq!(env::var("DEP_FOO_BAR").unwrap().as_slice(), "baz");
-             }
-         "#)
-         .file(".cargo/config", format!(r#"
-@@ -342,8 +342,8 @@ test!(links_passes_env_vars {
-         .file("build.rs", r#"
-             use std::env;
-             fn main() {
--                assert_eq!(env::var_string("DEP_FOO_FOO").unwrap().as_slice(), "bar");
--                assert_eq!(env::var_string("DEP_FOO_BAR").unwrap().as_slice(), "baz");
-+                assert_eq!(env::var("DEP_FOO_FOO").unwrap().as_slice(), "bar");
-+                assert_eq!(env::var("DEP_FOO_BAR").unwrap().as_slice(), "baz");
-             }
-         "#)
-         .file("a/Cargo.toml", r#"
-@@ -441,8 +441,8 @@ test!(rebuild_continues_to_pass_env_vars {
-         .file("build.rs", r#"
-             use std::env;
-             fn main() {
--                assert_eq!(env::var_string("DEP_FOO_FOO").unwrap().as_slice(), "bar");
--                assert_eq!(env::var_string("DEP_FOO_BAR").unwrap().as_slice(), "baz");
-+                assert_eq!(env::var("DEP_FOO_FOO").unwrap().as_slice(), "bar");
-+                assert_eq!(env::var("DEP_FOO_BAR").unwrap().as_slice(), "baz");
-             }
-         "#);
- 
-@@ -727,7 +727,7 @@ test!(out_dir_is_preserved {
-             use std::env;
-             use std::old_io::File;
-             fn main() {
--                let out = env::var_string("OUT_DIR").unwrap();
-+                let out = env::var("OUT_DIR").unwrap();
-                 File::create(&Path::new(out).join("foo")).unwrap();
-             }
-         "#);
-@@ -742,7 +742,7 @@ test!(out_dir_is_preserved {
-         use std::env;
-         use std::old_io::File;
-         fn main() {
--            let out = env::var_string("OUT_DIR").unwrap();
-+            let out = env::var("OUT_DIR").unwrap();
-             File::open(&Path::new(out).join("foo")).unwrap();
-         }
-     "#).unwrap();
-@@ -808,7 +808,7 @@ test!(code_generation {
-             use std::old_io::File;
- 
-             fn main() {
--                let dst = Path::new(env::var_string("OUT_DIR").unwrap());
-+                let dst = Path::new(env::var("OUT_DIR").unwrap());
-                 let mut f = File::create(&dst.join("hello.rs")).unwrap();
-                 f.write_str("
-                     pub fn message() -> &'static str {
-@@ -972,9 +972,9 @@ test!(test_a_lib_with_a_build_command {
-             use std::old_io::File;
- 
-             fn main() {
--                let out = Path::new(env::var_string("OUT_DIR").unwrap());
-+                let out = Path::new(env::var("OUT_DIR").unwrap());
-                 File::create(&out.join("foo.rs")).write_str("
--                    fn foo() -> int { 1 }
-+                    fn foo() -> i32 { 1 }
-                 ").unwrap();
-             }
-         "#);
-@@ -1062,7 +1062,7 @@ test!(build_script_with_dynamic_native_dependency {
-             use std::env;
- 
-             fn main() {
--                let src = Path::new(env::var_string("SRC").unwrap());
-+                let src = Path::new(env::var("SRC").unwrap());
-                 println!("cargo:rustc-flags=-L {}", src.dir_path().display());
-             }
-         "#)
-diff --git a/tests/test_cargo_compile_git_deps.rs b/tests/test_cargo_compile_git_deps.rs
-index 5777e1a..11a152f 100644
---- a/tests/test_cargo_compile_git_deps.rs
-+++ b/tests/test_cargo_compile_git_deps.rs
-@@ -461,7 +461,7 @@ test!(two_revs_same_deps {
-             version = "0.0.0"
-             authors = []
-         "#)
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }")
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }")
-     }).unwrap();
- 
-     let repo = git2::Repository::open(&bar.root()).unwrap();
-@@ -469,7 +469,7 @@ test!(two_revs_same_deps {
- 
-     // Commit the changes and make sure we trigger a recompile
-     File::create(&bar.root().join("src/lib.rs")).write_str(r#"
--        pub fn bar() -> int { 2 }
-+        pub fn bar() -> i32 { 2 }
-     "#).unwrap();
-     add(&repo);
-     let rev2 = commit(&repo);
-@@ -511,7 +511,7 @@ test!(two_revs_same_deps {
-         "#, bar.url(), rev2).as_slice())
-         .file("src/lib.rs", r#"
-             extern crate bar;
--            pub fn baz() -> int { bar::bar() }
-+            pub fn baz() -> i32 { bar::bar() }
-         "#);
- 
-     baz.build();
-@@ -860,7 +860,7 @@ test!(stale_cached_version {
-             version = "0.0.0"
-             authors = []
-         "#)
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }")
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }")
-     }).unwrap();
- 
-     // Update the git database in the cache with the current state of the git
-@@ -887,7 +887,7 @@ test!(stale_cached_version {
-     // Update the repo, and simulate someone else updating the lockfile and then
-     // us pulling it down.
-     File::create(&bar.root().join("src/lib.rs")).write_str(r#"
--        pub fn bar() -> int { 1 + 0 }
-+        pub fn bar() -> i32 { 1 + 0 }
-     "#).unwrap();
-     let repo = git2::Repository::open(&bar.root()).unwrap();
-     add(&repo);
-@@ -1090,7 +1090,7 @@ test!(git_build_cmd_freshness {
-             build = "build.rs"
-         "#)
-         .file("build.rs", "fn main() {}")
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }")
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }")
-         .file(".gitignore", "
-             src/bar.rs
-         ")
-@@ -1166,7 +1166,7 @@ test!(git_repo_changing_no_rebuild {
-             version = "0.5.0"
-             authors = ["wycats@example.com"]
-         "#)
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }")
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }")
-     }).unwrap();
- 
-     // Lock p1 to the first rev in the git repo
-@@ -1193,7 +1193,7 @@ test!(git_repo_changing_no_rebuild {
- 
-     // Make a commit to lock p2 to a different rev
-     File::create(&bar.root().join("src/lib.rs")).write_str(r#"
--        pub fn bar() -> int { 2 }
-+        pub fn bar() -> i32 { 2 }
-     "#).unwrap();
-     let repo = git2::Repository::open(&bar.root()).unwrap();
-     add(&repo);
-@@ -1256,7 +1256,7 @@ test!(git_dep_build_cmd {
-             name = "bar"
-         "#)
-         .file("bar/src/bar.rs.in", r#"
--            pub fn gimme() -> int { 0 }
-+            pub fn gimme() -> i32 { 0 }
-         "#)
-         .file("bar/build.rs", r#"
-             use std::old_io::fs;
-@@ -1278,7 +1278,7 @@ test!(git_dep_build_cmd {
- 
-     // Touching bar.rs.in should cause the `build` command to run again.
-     let mut file = fs::File::create(&p.root().join("bar/src/bar.rs.in")).unwrap();
--    file.write_str(r#"pub fn gimme() -> int { 1 }"#).unwrap();
-+    file.write_str(r#"pub fn gimme() -> i32 { 1 }"#).unwrap();
-     drop(file);
- 
-     assert_that(p.process(cargo_dir().join("cargo")).arg("build"),
-@@ -1297,7 +1297,7 @@ test!(fetch_downloads {
-             version = "0.5.0"
-             authors = ["wycats@example.com"]
-         "#)
--        .file("src/lib.rs", "pub fn bar() -> int { 1 }")
-+        .file("src/lib.rs", "pub fn bar() -> i32 { 1 }")
-     }).unwrap();
- 
-     let p = project("p1")
-@@ -1569,7 +1569,7 @@ test!(update_one_source_updates_all_packages_in_that_git_source {
- 
-     // Just be sure to change a file
-     File::create(&dep.root().join("src/lib.rs")).write_str(r#"
--        pub fn bar() -> int { 2 }
-+        pub fn bar() -> i32 { 2 }
-     "#).unwrap();
-     add(&repo);
-     commit(&repo);
-diff --git a/tests/test_cargo_compile_plugins.rs b/tests/test_cargo_compile_plugins.rs
-index 853038f..ca44a4d 100644
---- a/tests/test_cargo_compile_plugins.rs
-+++ b/tests/test_cargo_compile_plugins.rs
-@@ -23,14 +23,14 @@ test!(plugin_to_the_max {
-         "#)
-         .file("src/main.rs", r#"
-             #![feature(plugin)]
--            #[plugin] #[no_link] extern crate bar;
-+            #![plugin(bar)]
-             extern crate foo_lib;
- 
-             fn main() { foo_lib::foo(); }
-         "#)
-         .file("src/foo_lib.rs", r#"
-             #![feature(plugin)]
--            #[plugin] #[no_link] extern crate bar;
-+            #![plugin(bar)]
- 
-             pub fn foo() {}
-         "#);
-@@ -122,7 +122,7 @@ test!(plugin_with_dynamic_native_dependency {
-         "#)
-         .file("src/main.rs", r#"
-             #![feature(plugin)]
--            #[plugin] #[no_link] extern crate bar;
-+            #![plugin(bar)]
- 
-             fn main() {}
-         "#)
-diff --git a/tests/test_cargo_cross_compile.rs b/tests/test_cargo_cross_compile.rs
-index a2d53e0..cf6b9a5 100644
---- a/tests/test_cargo_cross_compile.rs
-+++ b/tests/test_cargo_cross_compile.rs
-@@ -12,7 +12,7 @@ fn setup() {
- 
- fn disabled() -> bool {
-     // First, disable if ./configure requested so
--    match env::var_string("CFG_DISABLE_CROSS_TESTS") {
-+    match env::var("CFG_DISABLE_CROSS_TESTS") {
-         Ok(ref s) if s.as_slice() == "1" => return true,
-         _ => {}
-     }
-@@ -44,7 +44,7 @@ test!(simple_cross {
-         "#)
-         .file("build.rs", format!(r#"
-             fn main() {{
--                assert_eq!(std::env::var_string("TARGET").unwrap().as_slice(), "{}");
-+                assert_eq!(std::env::var("TARGET").unwrap().as_slice(), "{}");
-             }}
-         "#, alternate()).as_slice())
-         .file("src/main.rs", r#"
-@@ -119,8 +119,7 @@ test!(plugin_deps {
-         "#)
-         .file("src/main.rs", r#"
-             #![feature(plugin)]
--            #[plugin] #[no_link]
--            extern crate bar;
-+            #![plugin(bar)]
-             extern crate baz;
-             fn main() {
-                 assert_eq!(bar!(), baz::baz());
-@@ -155,7 +154,7 @@ test!(plugin_deps {
- 
-             fn expand_bar(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
-                           -> Box<MacResult + 'static> {
--                MacExpr::new(quote_expr!(cx, 1i))
-+                MacExpr::new(quote_expr!(cx, 1))
-             }
-         "#);
-     let baz = project("baz")
-@@ -165,7 +164,7 @@ test!(plugin_deps {
-             version = "0.0.1"
-             authors = []
-         "#)
--        .file("src/lib.rs", "pub fn baz() -> int { 1 }");
-+        .file("src/lib.rs", "pub fn baz() -> i32 { 1 }");
-     bar.build();
-     baz.build();
- 
-@@ -197,8 +196,7 @@ test!(plugin_to_the_max {
-         "#)
-         .file("src/main.rs", r#"
-             #![feature(plugin)]
--            #[plugin] #[no_link]
--            extern crate bar;
-+            #![plugin(bar)]
-             extern crate baz;
-             fn main() {
-                 assert_eq!(bar!(), baz::baz());
-@@ -320,7 +318,7 @@ test!(plugin_with_extra_dylib_dep {
-         "#)
-         .file("src/main.rs", r#"
-             #![feature(plugin)]
--            #[plugin] #[no_link] extern crate bar;
-+            #![plugin(bar)]
- 
-             fn main() {}
-         "#);
-@@ -362,7 +360,7 @@ test!(plugin_with_extra_dylib_dep {
-             name = "baz"
-             crate_type = ["dylib"]
-         "#)
--        .file("src/lib.rs", "pub fn baz() -> int { 1 }");
-+        .file("src/lib.rs", "pub fn baz() -> i32 { 1 }");
-     bar.build();
-     baz.build();
- 
-@@ -464,8 +462,8 @@ test!(cross_with_a_build_script {
-         .file("build.rs", format!(r#"
-             use std::env;
-             fn main() {{
--                assert_eq!(env::var_string("TARGET").unwrap().as_slice(), "{0}");
--                let mut path = Path::new(env::var_string("OUT_DIR").unwrap());
-+                assert_eq!(env::var("TARGET").unwrap().as_slice(), "{0}");
-+                let mut path = Path::new(env::var("OUT_DIR").unwrap());
-                 assert_eq!(path.filename().unwrap(), b"out");
-                 path.pop();
-                 assert!(path.filename().unwrap().starts_with(b"foo-"));
-@@ -530,7 +528,7 @@ test!(build_script_needed_for_host_and_target {
-         .file("d1/build.rs", r#"
-             use std::env;
-             fn main() {
--                let target = env::var_string("TARGET").unwrap();
-+                let target = env::var("TARGET").unwrap();
-                 println!("cargo:rustc-flags=-L /path/to/{}", target);
-             }
-         "#)
-@@ -643,9 +641,9 @@ test!(build_script_only_host {
-             use std::env;
- 
-             fn main() {
--                assert!(env::var_string("OUT_DIR").unwrap()
-+                assert!(env::var("OUT_DIR").unwrap()
-                                              .contains("target/build/d1-"),
--                        "bad: {:?}", env::var_string("OUT_DIR"));
-+                        "bad: {:?}", env::var("OUT_DIR"));
-             }
-         "#);
- 
-diff --git a/tests/test_cargo_profiles.rs b/tests/test_cargo_profiles.rs
-index b71eadb..827393f 100644
---- a/tests/test_cargo_profiles.rs
-+++ b/tests/test_cargo_profiles.rs
-@@ -1,4 +1,4 @@
--use std::os;
-+use std::env;
- use std::old_path;
- 
- use support::{project, execs};
-@@ -110,6 +110,6 @@ test!(top_level_overrides_deps {
-                     dir = p.root().display(),
-                     url = p.url(),
-                     sep = old_path::SEP,
--                    prefix = os::consts::DLL_PREFIX,
--                    suffix = os::consts::DLL_SUFFIX).as_slice()));
-+                    prefix = env::consts::DLL_PREFIX,
-+                    suffix = env::consts::DLL_SUFFIX).as_slice()));
- });
--- 
-2.3.0
-