rust: strip whitespace from features

This whitespace in here causes rust to not be happy with the features
and throw warnings about a feature such as ' +sse3' being unsupported
when '+sse3' works just fine. Amazingly will cause rustc to abort when
you try to resolve the features to valid configs with the `--print` arg
to rustc.

(cherry picked from commit ce9949725c)

Jenkinsfile

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

README.md

@@ -57,9 +57,11 @@ On the target:
 
 ## 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.
 
 ## Copyright
 
-MIT/Apache-2.0 - Same as rust
+MIT OR Apache-2.0 - Same as rust
 

classes/cargo.bbclass

@@ -5,20 +5,15 @@ export CARGO_HOME = "${WORKDIR}/cargo_home"
 
 def cargo_base_dep(d):
     deps = ""
-    if not d.getVar('INHIBIT_DEFAULT_DEPS') and not d.getVar('INHIBIT_CARGO_DEP'):
+    if not d.getVar('INHIBIT_DEFAULT_DEPS', True) and not d.getVar('INHIBIT_CARGO_DEP', True):
         deps += " cargo-native"
     return deps
 
 BASEDEPENDS_append = " ${@cargo_base_dep(d)}"
 
-# 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"
-
 # 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"
@@ -31,19 +26,19 @@ 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.
+	# FIXME: we currently make a mess in the directory above us
+	# (${WORKDIR}), which may not be ideal. Look into whether this is
+	# allowed
+	mkdir -p ../.cargo
 	# 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
+	echo "paths = [" >../.cargo/config
 
 	for p in ${EXTRA_OECARGO_PATHS}; do
 		printf "\"%s\"\n" "$p"
-	done | sed -e 's/$/,/' >>.cargo/config
-	echo "]" >>.cargo/config
+	done | sed -e 's/$/,/' >>../.cargo/config
+	echo "]" >>../.cargo/config
 }
 
 rust_cargo_patch () {

classes/rust-bin.bbclass

@@ -2,6 +2,7 @@ inherit rust
 
 RUSTLIB_DEP ?= " rustlib"
 DEPENDS .= "${RUSTLIB_DEP}"
+RDEPENDS_${PN} .= "${RUSTLIB_DEP}"
 DEPENDS += "patchelf-native"
 
 export rustlibdir = "${libdir}/rust"
@@ -19,9 +20,10 @@ OVERLAP_LIBS = "\
     libc \
     log \
     getopts \
+    rand \
 "
 def get_overlap_deps(d):
-    deps = d.getVar("DEPENDS").split()
+    deps = d.getVar("DEPENDS", True).split()
     overlap_deps = []
     for o in d.getVar("OVERLAP_LIBS", True).split():
         l = len([o for dep in deps if (o + '-rs' in dep)])
@@ -34,10 +36,14 @@ OVERLAP_DEPS = "${@get_overlap_deps(d)}"
 # See https://github.com/rust-lang/rust/issues/19680
 RUSTC_FLAGS += "-C prefer-dynamic"
 
-rustlib="${libdir}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/lib"
+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}"
 CRATE_NAME ?= "${@d.getVar('BPN', True).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"
@@ -45,7 +51,7 @@ LIB_SRC ?= "${S}/src/lib.rs"
 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 +63,21 @@ get_overlap_externs () {
     echo "$externs"
 }
 
+do_configure () {
+}
+
 oe_compile_rust_lib () {
+    [ "${CRATE_TYPE}" == "dylib" ] && suffix=so || suffix=rlib
     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"
+        link_args[1]="link-args=-Wl,-soname -Wl,${LIBNAME}.$suffix"
     fi
     oe_runrustc $(get_overlap_externs) \
         "${link_args[@]}" \
         ${LIB_SRC} \
+        -o ${LIBNAME}.$suffix \
         --crate-name=${CRATE_NAME} --crate-type=${CRATE_TYPE} \
         "$@"
 }
@@ -98,7 +109,7 @@ do_rust_bin_fixups() {
 
     for f in `find ${PKGD}`; do
         file "$f" | grep -q ELF || continue
-        readelf -d "$f" | grep RPATH | grep -q rustlib || continue
+        readelf -d "$f" | grep RUNPATH | grep -q rustlib || continue
         echo "Set rpath:" "$f"
         patchelf --set-rpath '$ORIGIN:'${rustlibdir}:${rustlib} "$f"
     done

classes/rust.bbclass

@@ -1,13 +1,13 @@
 RUSTC = "rustc"
 
 # FIXME: --sysroot might be needed
-RUSTC_ARCHFLAGS += "--target=${TARGET_SYS} -C rpath"
+RUSTC_ARCHFLAGS += "--target=${TARGET_SYS} -C rpath -C crate_hash=${BB_TASKHASH}"
 
 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 not d.getVar('INHIBIT_DEFAULT_RUST_DEPS', True):
         if (d.getVar('HOST_SYS', True) != d.getVar('BUILD_SYS', True)):
             deps += " virtual/${TARGET_PREFIX}rust"
         else:
@@ -33,6 +33,8 @@ def rust_base_triple(d, thing):
     if arch.startswith("arm"):
         if os.endswith("gnueabi"):
             os += bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hf', '', d)
+    elif arch.startswith("aarch64"):
+        os = "linux-gnu"
     elif arch.startswith("x86_64"):
         os = "linux-gnu"
     elif arch.startswith("i586"):
@@ -80,3 +82,5 @@ HOST_LDFLAGS  ?= "${LDFLAGS}"
 HOST_CFLAGS   ?= "${CFLAGS}"
 HOST_CXXFLAGS ?= "${CXXFLAGS}"
 HOST_CPPFLAGS ?= "${CPPFLAGS}"
+
+EXTRA_OECONF_remove = "--disable-static"

classes/shared-source-provide.bbclass

@@ -0,0 +1,38 @@
+# In order to share the same source between multiple packages (.bb files), we
+# unpack and patch the X source here into a shared dir.
+#
+# Take a look at gcc-source.inc for the general structure of this
+
+# We require that "SOURCE_NAME" be set
+
+# nopackages.bbclass {
+deltask do_package
+deltask do_package_write_rpm
+deltask do_package_write_ipk
+deltask do_package_write_deb
+deltask do_package_qa
+deltask do_packagedata
+#}
+
+deltask do_configure
+deltask do_compile
+deltask do_install
+deltask do_populate_sysroot
+deltask do_populate_lic
+deltask do_rm_work
+
+
+# override to get rid of '-native' or other misc
+# XXX: consider ${PR}
+PN = "${SOURCE_NAME}-source-${PV}"
+WORKDIR = "${TMPDIR}/work-shared/${SOURCE_NAME}-${PV}-${PR}"
+SSTATE_SWSPEC = "sstate:${SOURCE_NAME}::${PV}:${PR}::${SSTATE_VERSION}:"
+
+STAMP = "${STAMPS_DIR}/work-shared/${SOURCE_NAME}-${PV}-${PR}"
+STAMPCLEAN = "${STAMPS_DIR}/work-shared/${SOURCE_NAME}-${PV}-*"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = ""
+PACKAGES = ""
+
+EXCLUDE_FROM_WORLD = "1"

classes/shared-source-use.bbclass

@@ -0,0 +1,3 @@
+S = "${TMPDIR}/work-shared/${SOURCE_NAME}-${PV}-${PR}"
+
+do_unpack[depends] += "${SOURCE_NAME}-source-${PV}:do_patch"

conf/bblayers.conf.sample

@@ -0,0 +1,21 @@
+# 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-yocto \
+  ##OEROOT##/meta-yocto-bsp \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-ruby \
+  "
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-yocto \
+  "

conf/distro/include/rust_security_flags.inc

@@ -1,6 +1,5 @@
 # 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}"

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"
+
+#
+# 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/sstate/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"

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

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

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

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

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

@@ -15,10 +15,12 @@ SRCREV = "8b7c17db2235a2a3f2c71242b11fc429a8d05a90"
 
 S = "${WORKDIR}/git"
 
+LIB_SRC = "${S}/src/liblibc/lib.rs"
+
 do_compile () {
-	oe_runrustc ${S}/src/liblibc/lib.rs --cfg feature='"cargo-build"'
+	oe_compile_rust_lib --cfg feature='"cargo-build"'
 }
 
 do_install () {
-	install -D -m 644 liblibc.rlib ${D}/${rustlibdir}/liblibc.rlib
+	oe_install_rust_lib
 }

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

@@ -11,9 +11,6 @@ SRCREV = "a91e63378bf6f4bba5c7d88f4fe98efdcb432c99"
 
 S = "${WORKDIR}/git"
 
-# This module is tiny. One wrapper function only.
-CRATE_TYPE = "rlib"
-
 do_compile () {
 	oe_compile_rust_lib
 }

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

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

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

@@ -2,6 +2,4 @@ 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/rustc-serialize/rustc-serialize-rs_0.3.15.bb

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

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

@@ -15,7 +15,10 @@ SRCREV = "32b212b877b836dbfdc97af5674d91672e70ecbd"
 S = "${WORKDIR}/git"
 
 do_compile () {
-	oe_compile_rust_lib
+	rm -rf time_helpers.o libtimehelpers.a
+	${CC} ${S}/src/time_helpers.c -fPIC -c -o time_helpers.o
+	${AR} rcs libtime_helpers.a time_helpers.o
+	oe_compile_rust_lib -L native=$PWD -l static=time_helpers
 }
 
 do_install () {

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

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

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

@@ -12,7 +12,6 @@ SRCREV = "14c24afc61e3315dffddab2c7f36999a16a002d8"
 S = "${WORKDIR}/git"
 
 RUSTC_FLAGS += "-ludev"
-CRATE_TYPE = "rlib"
 
 do_compile () {
 	oe_compile_rust_lib

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

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

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

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

recipes-deps/libgit2/libgit2.inc

@@ -2,7 +2,7 @@ SUMMARY = "the Git linkable library"
 HOMEPAGE = "http://libgit2.github.com/"
 LICENSE = "GPL-2.0-with-linking-exception"
 
-DEPENDS = "zlib"
+DEPENDS = "openssl zlib"
 
 inherit cmake
 

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_0.23.4.bb

@@ -0,0 +1,4 @@
+LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2"
+SRC_URI[md5sum] = "b7db3ab71dfa19fe1dc7fef76d6af216"
+SRC_URI[sha256sum] = "c7f5e2d7381dbc4d7e878013d14f9993ae8a41bd23f032718e39ffba57894029"
+require libgit2-release.inc

recipes-deps/libgit2/libgit2_git.bb

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

recipes-devtools/cargo/cargo-native_git.bb

@@ -1,36 +0,0 @@
-SUMMARY = "Cargo downloads your Rust project's dependencies and builds your project"
-HOMEPAGE = "http://crates.io"
-SECTION = "devel"
-LICENSE = "MIT | Apache-2.0"
-
-PR = "r2"
-
-DEPENDS += "rust-native"
-
-LIC_FILES_CHKSUM ="\
-    file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
-    file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
-    file://LICENSE-THIRD-PARTY;md5=afbb7ae0aa70c8e437a007314eae5f3b \
-"
-
-SRC_URI = " \
-    https://static.rust-lang.org/cargo-dist/2015-04-02/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz \
-"
-
-SRC_URI[md5sum] = "3d62194d02a9088cd8aae379e9498134"
-SRC_URI[sha256sum] = "16b6338ba2942989693984ba4dbd057c2801e8805e6da8fa7b781b00e722d117"
-
-S = "${WORKDIR}/cargo-nightly-x86_64-unknown-linux-gnu/"
-
-inherit native
-
-do_install() {
-    install -d ${D}
-    sh ${S}/install.sh --destdir=${D}${STAGING_DIR_NATIVE} --prefix= 
-
-    # Remove files provided by rust 
-    rm -f ${D}${STAGING_DIR_NATIVE}/lib/rustlib/uninstall.sh
-    rm -f ${D}${STAGING_DIR_NATIVE}/lib/rustlib/install.log
-    rm -f ${D}${STAGING_DIR_NATIVE}/lib/rustlib/components
-    rm -f ${D}${STAGING_DIR_NATIVE}/lib/rustlib/rust-installer-version
-}

recipes-devtools/cargo/cargo-snapshot.inc

@@ -0,0 +1,4 @@
+
+CARGO_SNAPSHOT = "2016-01-31/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
+SRC_URI[md5sum] = "52f48780b7cfadc88813766048d4d402"
+SRC_URI[sha256sum] = "1920e661bab536eba763ff6704a1d62fb20bb0f67d8c5a119e41c49510ea5fa6"

recipes-devtools/cargo/cargo.inc

@@ -12,20 +12,9 @@ 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 ??= ""
@@ -34,6 +23,9 @@ PACKAGECONFIG ??= ""
 # & rust's use of cooked triples
 PACKAGECONFIG[rust-snapshot] = "--local-rust-root=${B}/rustc"
 
+# Used in libgit2-sys's build.rs, needed for pkg-config to be used
+export LIBGIT2_SYS_USE_PKG_CONFIG = "1"
+
 do_configure () {
 	${@bb.utils.contains('PACKAGECONFIG', 'rust-snapshot', '${S}/.travis.install.deps.sh', ':', d)}
 
@@ -62,7 +54,7 @@ do_compile () {
 
 	rm -rf target/snapshot
 	mkdir -p target
-	cp -R ${WORKDIR}/$(basename ${CARGO_SNAPSHOT} .tar.gz) target/snapshot
+	cp -R ${WORKDIR}/$(basename ${CARGO_SNAPSHOT} .tar.gz)/cargo target/snapshot
 
 	oe_runmake ARGS="--verbose"
 }
@@ -70,3 +62,5 @@ do_compile () {
 do_install () {
 	oe_runmake DESTDIR="${D}" install
 }
+
+BBCLASSEXTEND = "native"

recipes-devtools/cargo/cargo_0.9.0.bb

@@ -0,0 +1,57 @@
+require cargo-snapshot.inc
+require cargo.inc
+
+SRC_URI += " \
+	https://github.com/rust-lang/cargo/archive/${PV}.tar.gz;name=cargo \
+	file://0001-disable-cargo-snapshot-fetch.patch \
+	git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=${BP}/src/rust-installer \
+"
+SRC_URI[cargo.md5sum] = "c3002e297f125ad40b2e0279219163bc"
+SRC_URI[cargo.sha256sum] = "4cadc436be442505851f3a8e9ffff1ef10b6379101a7f8e0afa9fa80f5198f89"
+
+SRCREV_rust-installer = "c37d3747da75c280237dc2d6b925078e69555499"
+
+S = "${WORKDIR}/${BP}"
+
+LIC_FILES_CHKSUM ="\
+	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+	file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
+"
+
+## curl-rust
+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.patch;patchdir=../curl-rust \
+       file://curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch;patchdir=../curl-rust \
+"
+
+# 0.2.14  / -sys 0.1.29
+SRCREV_curl-rust = "76172b3ebf958fcf0b10d400f19ee02486a80ee7"
+
+SRCREV_FORMAT .= "_curl-rust"
+EXTRA_OECARGO_PATHS += "${WORKDIR}/curl-rust"
+
+## ssh2-rs
+SRC_URI += "\
+	git://github.com/alexcrichton/ssh2-rs.git;protocol=https;name=ssh2-rs;destsuffix=ssh2-rs \
+	file://ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch;patchdir=../ssh2-rs \
+"
+
+# 0.2.10 / -sys 0.1.34
+SRCREV_ssh2-rs = "00af6ead0c3d4b82e05bee4d9963ef3823bcf524"
+
+SRCREV_FORMAT .= "_ssh2-rs"
+EXTRA_OECARGO_PATHS += "${WORKDIR}/ssh2-rs"
+
+## git2-rs
+SRC_URI += "\
+	git://github.com/alexcrichton/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \
+	file://git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch;patchdir=../git2-rs \
+"
+
+# 0.3.3 / -sys 0.3.8
+SRCREV_git2-rs = "19b6873c1fad7dc93c9c2dac4cba339dacf16efa"
+
+SRCREV_FORMAT .= "_git2-rs"
+EXTRA_OECARGO_PATHS += "${WORKDIR}/git2-rs"

recipes-devtools/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-devtools/cargo/files/0001-disable-cargo-snapshot-fetch.patch

@@ -0,0 +1,27 @@
+From 9652ddba460f30e83f401ab1564656e7787bdea9 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Wed, 3 Feb 2016 15:59:48 -0500
+Subject: [PATCH] disable cargo snapshot fetch
+
+---
+ Makefile.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 286a593..9c66486 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -92,10 +92,6 @@ test-unit-$(1): $$(CARGO)
+ endef
+ $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target))))
+ 
+-$(TARGET_ROOT)/snapshot/bin/cargo$(X): src/snapshots.txt
+-	$(CFG_PYTHON) src/etc/dl-snapshot.py $(CFG_BUILD)
+-	touch $@
+-
+ 
+ # === Tests
+ 
+-- 
+2.7.0
+

recipes-devtools/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
-

recipes-devtools/cargo/files/0001-update-pkg-versions.patch

@@ -1,138 +0,0 @@
-From f32fa685610399739a2584ae02653753a372d6ed Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Fri, 13 Feb 2015 15:24:16 -0500
-Subject: [PATCH] update pkg versions
-
----
- Cargo.lock | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 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)",
--- 
-2.3.0
-

recipes-devtools/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch

@@ -1,55 +0,0 @@
-From 797df37f3a9b377db475f3d2eae09fcbb90d2e4f Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 25 Nov 2014 11:50:28 -0500
-Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is
- needed, pkgconfig will pull it in
-
----
- curl-sys/Cargo.toml | 19 -------------------
- curl-sys/lib.rs     |  2 --
- 2 files changed, 21 deletions(-)
-
-diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
-index 6e99e16..50d1101 100644
---- a/curl-sys/Cargo.toml
-+++ b/curl-sys/Cargo.toml
-@@ -18,23 +18,4 @@ path = "lib.rs"
- [dependencies]
- libz-sys = "0.1.0"
- libc = "0.1"
--
--# Unix platforms use OpenSSL for now to provide SSL functionality
--[target.i686-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
--[target.i686-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--[target.arm-unknown-linux-gnueabihf.dependencies]
--openssl-sys = "0.6.0"
--[target.aarch64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--[target.i686-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-bitrig.dependencies]
- openssl-sys = "0.6.0"
-diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs
-index 7cae355..a2d58ea 100644
---- a/curl-sys/lib.rs
-+++ b/curl-sys/lib.rs
-@@ -1,8 +1,6 @@
- #![allow(non_camel_case_types, raw_pointer_derive)]
- 
- extern crate libc;
--#[cfg(not(target_env = "msvc"))] extern crate libz_sys;
--#[cfg(unix)] extern crate openssl_sys;
- 
- use libc::{c_void, c_int, c_char, c_uint, c_long};
- 
--- 
-2.4.3
-

recipes-devtools/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.patch

@@ -0,0 +1,62 @@
+From 6d74b6af6a23e195fc54c81a9bbdb21e7d5b6414 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Sat, 12 Dec 2015 22:36:26 -0500
+Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl
+
+linking libcurl with libssl is handled by pkg-config, not us
+This also allows non-blessed triples to work.
+---
+ curl-sys/Cargo.toml | 26 --------------------------
+ curl-sys/lib.rs     |  2 --
+ 2 files changed, 28 deletions(-)
+
+diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
+index bf994bf..f153039 100644
+--- a/curl-sys/Cargo.toml
++++ b/curl-sys/Cargo.toml
+@@ -19,29 +19,3 @@ path = "lib.rs"
+ [dependencies]
+ libz-sys = ">= 0"
+ libc = "0.2"
+-
+-# Unix platforms use OpenSSL for now to provide SSL functionality
+-[target.i686-unknown-linux-gnu.dependencies]
+-openssl-sys = ">= 0"
+-[target.i686-linux-android.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-linux-gnu.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-linux-musl.dependencies]
+-openssl-sys = ">= 0"
+-[target.arm-unknown-linux-gnueabihf.dependencies]
+-openssl-sys = ">= 0"
+-[target.arm-linux-androideabi.dependencies]
+-openssl-sys = ">= 0"
+-[target.aarch64-unknown-linux-gnu.dependencies]
+-openssl-sys = ">= 0"
+-[target.i686-unknown-freebsd.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-freebsd.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-bitrig.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-openbsd.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-dragonfly.dependencies]
+-openssl-sys = ">= 0"
+diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs
+index be80469..b53b445 100644
+--- a/curl-sys/lib.rs
++++ b/curl-sys/lib.rs
+@@ -3,8 +3,6 @@
+ extern crate libc;
+ #[cfg(not(target_env = "msvc"))]
+ extern crate libz_sys;
+-#[cfg(all(unix, not(target_os = "macos")))]
+-extern crate openssl_sys;
+ 
+ use libc::{c_void, c_int, c_char, c_uint, c_long};
+ 
+-- 
+2.4.10
+

recipes-devtools/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch

@@ -1,48 +1,54 @@
-From 625b2491eca17e78fdec374f8e83ec00fcca5fc8 Mon Sep 17 00:00:00 2001
+From 445289f4eacc5c048e4a455bb6d6a6a2b9995e88 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 25 Nov 2014 12:26:48 -0500
-Subject: [PATCH 2/2] remove per-triple deps on openssl-sys
+Date: Sat, 12 Dec 2015 22:40:33 -0500
+Subject: [PATCH 2/2] remove per triple deps on openssl-sys
 
 ---
- Cargo.toml | 21 +--------------------
- 1 file changed, 1 insertion(+), 20 deletions(-)
+ Cargo.toml | 27 +--------------------------
+ 1 file changed, 1 insertion(+), 26 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 16b72c3..68235ae 100644
+index 74f63c8..28aa1fa 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -12,30 +12,11 @@ url = "0.2.0"
+@@ -12,36 +12,11 @@ url = "0.2.0"
  log = "0.3.0"
- libc = "0.1"
+ libc = "0.2"
  curl-sys = { path = "curl-sys", version = "0.1.0" }
-+openssl-sys = "0.6.0"
++openssl-sys = "0.7.0"
  
  [dev-dependencies]
  env_logger = "0.3.0"
  
 -# Unix platforms use OpenSSL for now to provide SSL functionality
--[target.i686-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
 -[target.i686-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
+-openssl-sys = "0.7.0"
+-[target.i686-linux-android.dependencies]
+-openssl-sys = "0.7.0"
 -[target.x86_64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-linux-musl.dependencies]
+-openssl-sys = "0.7.0"
 -[target.arm-unknown-linux-gnueabihf.dependencies]
--openssl-sys = "0.6.0"
+-openssl-sys = "0.7.0"
+-[target.arm-linux-androideabi.dependencies]
+-openssl-sys = "0.7.0"
 -[target.aarch64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
+-openssl-sys = "0.7.0"
 -[target.i686-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
+-openssl-sys = "0.7.0"
 -[target.x86_64-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
+-openssl-sys = "0.7.0"
 -[target.x86_64-unknown-bitrig.dependencies]
--openssl-sys = "0.6.0"
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-openbsd.dependencies]
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-dragonfly.dependencies]
+-openssl-sys = "0.7.0"
 -
  [[test]]
  
  name = "test"
 -- 
-2.4.3
+2.4.10
 

recipes-devtools/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch

@@ -1,59 +0,0 @@
-From aa1bea8387b6108ca2cd60ad71e8d354d8790d62 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Mon, 10 Nov 2014 15:06:29 -0500
-Subject: [PATCH] Add generic openssl-sys dep
-
----
- libgit2-sys/Cargo.toml | 36 ++----------------------------------
- 1 file changed, 2 insertions(+), 34 deletions(-)
-
-diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml
-index 9c0aa6c..d95d07e 100644
---- a/libgit2-sys/Cargo.toml
-+++ b/libgit2-sys/Cargo.toml
-@@ -16,40 +16,8 @@ description = "Native bindings to the libgit2 library"
- [dependencies]
- libssh2-sys = "0.1.0"
- libc = "0.1"
-+openssl-sys = "0.6.0"
-+libz-sys = "0.1.0"
- 
- [build-dependencies]
- pkg-config = "0.3"
--
--[target.i686-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.x86_64-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.i686-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.x86_64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.aarch64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.arm-unknown-linux-gnueabihf.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.i686-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.x86_64-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.x86_64-unknown-bitrig.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.x86_64-unknown-openbsd.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--[target.x86_64-unknown-dragonfly.dependencies]
--openssl-sys = "0.6.0"
--libz-sys = "0.1.0"
--- 
-2.4.3
-

recipes-devtools/cargo/files/git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch

@@ -0,0 +1,50 @@
+From 95709b3f5b1495a57043975d7100461feed46b2f Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Sat, 12 Dec 2015 22:53:37 -0500
+Subject: [PATCH] libgit2-sys: avoid blessed triples
+
+---
+ libgit2-sys/Cargo.toml | 22 +---------------------
+ 1 file changed, 1 insertion(+), 21 deletions(-)
+
+diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml
+index 15b28d8..3590878 100644
+--- a/libgit2-sys/Cargo.toml
++++ b/libgit2-sys/Cargo.toml
+@@ -17,32 +17,12 @@ path = "lib.rs"
+ libssh2-sys = { version = ">= 0", optional = true }
+ libc = "0.2"
+ libz-sys = ">= 0"
++openssl-sys = "0.7.0"
+ 
+ [build-dependencies]
+ pkg-config = "0.3"
+ cmake = "0.1.2"
+ 
+-[target.i686-unknown-linux-gnu.dependencies]
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-linux-gnu.dependencies]
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-linux-musl.dependencies]
+-openssl-sys = "0.7.0"
+-[target.aarch64-unknown-linux-gnu.dependencies]
+-openssl-sys = "0.7.0"
+-[target.arm-unknown-linux-gnueabihf.dependencies]
+-openssl-sys = "0.7.0"
+-[target.i686-unknown-freebsd.dependencies]
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-freebsd.dependencies]
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-bitrig.dependencies]
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-openbsd.dependencies]
+-openssl-sys = "0.7.0"
+-[target.x86_64-unknown-dragonfly.dependencies]
+-openssl-sys = "0.7.0"
+-
+ [features]
+ ssh = ["libssh2-sys"]
+ https = []
+-- 
+2.4.10
+

recipes-devtools/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch

@@ -1,26 +0,0 @@
-From a1ba6ce6f54e3b2b0c3e05043a015bc845d24025 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 26 May 2015 22:10:18 -0400
-Subject: [PATCH 2/3] libgit2-sys: avoid the build script, it is a disaster
-
----
- libgit2-sys/build.rs | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs
-index d624a63..9b8b98c 100644
---- a/libgit2-sys/build.rs
-+++ b/libgit2-sys/build.rs
-@@ -15,6 +15,9 @@ macro_rules! t {
- }
- 
- fn main() {
-+    pkg_config::find_library("libgit2").unwrap();
-+    return;
-+
-     register_dep("SSH2");
-     register_dep("OPENSSL");
- 
--- 
-2.4.3
-

recipes-devtools/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch

@@ -1,25 +0,0 @@
-From ce3e8e83be261ed7cf0a62dc8e66361588329ba2 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 26 May 2015 22:06:57 -0400
-Subject: [PATCH 3/3] bump libssh2 to fix build with nightly
-
----
- libgit2-sys/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml
-index d95d07e..992ea7a 100644
---- a/libgit2-sys/Cargo.toml
-+++ b/libgit2-sys/Cargo.toml
-@@ -14,7 +14,7 @@ description = "Native bindings to the libgit2 library"
-   path = "lib.rs"
- 
- [dependencies]
--libssh2-sys = "0.1.0"
-+libssh2-sys = "0.1.23"
- libc = "0.1"
- openssl-sys = "0.6.0"
- libz-sys = "0.1.0"
--- 
-2.4.3
-

recipes-devtools/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch

@@ -1,45 +0,0 @@
-From b45c6ed5524690603a1888dff21556b7f42db474 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Mon, 1 Dec 2014 10:51:31 -0500
-Subject: [PATCH] Unconditionally depend on openssl-sys
-
----
- libssh2-sys/Cargo.toml | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
-index 501bba5..db8d21a 100644
---- a/libssh2-sys/Cargo.toml
-+++ b/libssh2-sys/Cargo.toml
-@@ -15,28 +15,6 @@ path = "lib.rs"
- [dependencies]
- libz-sys = "0.1.0"
- libc = "0.1"
--
--[target.i686-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-apple-darwin.dependencies]
--openssl-sys = "0.6.0"
--[target.i686-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--[target.aarch64-unknown-linux-gnu.dependencies]
--openssl-sys = "0.6.0"
--[target.arm-unknown-linux-gnueabihf.dependencies]
--openssl-sys = "0.6.0"
--[target.i686-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-freebsd.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-dragonfly.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-bitrig.dependencies]
--openssl-sys = "0.6.0"
--[target.x86_64-unknown-openbsd.dependencies]
- openssl-sys = "0.6.0"
- 
- [build-dependencies]
--- 
-2.4.3
-

recipes-devtools/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch

@@ -0,0 +1,62 @@
+From be07c11b438550829d82dc844e38806570232cd7 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Sat, 12 Dec 2015 22:44:14 -0500
+Subject: [PATCH] libssh2-sys: avoid explicitly linking in openssl
+
+---
+ libssh2-sys/Cargo.toml | 25 -------------------------
+ libssh2-sys/lib.rs     |  2 --
+ 2 files changed, 27 deletions(-)
+
+diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
+index b9ecec2..78f92ac 100644
+--- a/libssh2-sys/Cargo.toml
++++ b/libssh2-sys/Cargo.toml
+@@ -18,31 +18,6 @@ libc = "0.2"
+ ws2_32-sys = ">= 0"
+ winapi = "0.2"
+ 
+-[target.i686-apple-darwin.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-apple-darwin.dependencies]
+-openssl-sys = ">= 0"
+-[target.i686-unknown-linux-gnu.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-linux-gnu.dependencies]
+-openssl-sys = ">= 0"
+-[target.aarch64-unknown-linux-gnu.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-linux-musl.dependencies]
+-openssl-sys = ">= 0"
+-[target.arm-unknown-linux-gnueabihf.dependencies]
+-openssl-sys = ">= 0"
+-[target.i686-unknown-freebsd.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-freebsd.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-dragonfly.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-bitrig.dependencies]
+-openssl-sys = ">= 0"
+-[target.x86_64-unknown-openbsd.dependencies]
+-openssl-sys = ">= 0"
+-
+ [build-dependencies]
+ pkg-config = "0.3"
+ cmake = "0.1.2"
+diff --git a/libssh2-sys/lib.rs b/libssh2-sys/lib.rs
+index bb6c46f..40af82f 100644
+--- a/libssh2-sys/lib.rs
++++ b/libssh2-sys/lib.rs
+@@ -6,8 +6,6 @@ extern crate ws2_32;
+ extern crate winapi;
+ 
+ extern crate libz_sys;
+-#[cfg(unix)]
+-extern crate openssl_sys;
+ 
+ use libc::{c_int, size_t, c_void, c_char, c_long, c_uchar, c_uint, c_ulong};
+ use libc::ssize_t;
+-- 
+2.4.10
+

recipes-devtools/rust/files/rust-1.3.0/0001-platform.mk-avoid-choking-on-i586.patch

@@ -1,27 +0,0 @@
-From 6d0905573f38d0fbdde74848c0cd7cdbb603c238 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Sat, 15 Nov 2014 20:12:48 -0500
-Subject: [PATCH 01/10] platform.mk: avoid choking on i586
-
----
- mk/platform.mk | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mk/platform.mk b/mk/platform.mk
-index 60fe22c..9c57656 100644
---- a/mk/platform.mk
-+++ b/mk/platform.mk
-@@ -14,7 +14,9 @@
- # would create a variable HOST_i686-darwin-macos with the value
- # i386.
- define DEF_HOST_VAR
--  HOST_$(1) = $(subst i686,i386,$(word 1,$(subst -, ,$(1))))
-+  HOST_$(1) = $(subst i686,i386,\
-+    $(subst i586,i386,\
-+    $(word 1,$(subst -, ,$(1)))))
- endef
- $(foreach t,$(CFG_TARGET),$(eval $(call DEF_HOST_VAR,$(t))))
- $(foreach t,$(CFG_TARGET),$(info cfg: host for $(t) is $(HOST_$(t))))
--- 
-2.5.1
-

recipes-devtools/rust/files/rust-1.3.0/0002-Target-add-default-target.json-path-libdir-rust-targ.patch

@@ -1,109 +0,0 @@
-From e9d46f8cb10eec1f8ee19ed2aab385d17ec85757 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 18 Nov 2014 01:40:21 -0500
-Subject: [PATCH 02/10] Target: add default target.json path:
- $libdir/rust/targets
-
----
- src/librustc/session/config.rs  |  6 +++---
- src/librustc/session/mod.rs     |  8 ++++++--
- src/librustc_back/target/mod.rs | 14 +++++++++++---
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
-index c5db7cd..2b9069f 100644
---- a/src/librustc/session/config.rs
-+++ b/src/librustc/session/config.rs
-@@ -38,7 +38,7 @@ use getopts;
- use std::collections::HashMap;
- use std::env;
- use std::fmt;
--use std::path::PathBuf;
-+use std::path::{Path, PathBuf};
- 
- use llvm;
- 
-@@ -655,8 +655,8 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
-     v
- }
- 
--pub fn build_target_config(opts: &Options, sp: &SpanHandler) -> Config {
--    let target = match Target::search(&opts.target_triple) {
-+pub fn build_target_config(sysroot: &Path, opts: &Options, sp: &SpanHandler) -> Config {
-+    let target = match Target::search(sysroot, &opts.target_triple[..]) {
-         Ok(t) => t,
-         Err(e) => {
-             sp.handler().fatal(&format!("Error loading target specification: {}", e));
-diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
-index 99a58f0..d25e476 100644
---- a/src/librustc/session/mod.rs
-+++ b/src/librustc/session/mod.rs
-@@ -385,14 +385,18 @@ pub fn build_session_(sopts: config::Options,
-                       local_crate_source_file: Option<PathBuf>,
-                       span_diagnostic: diagnostic::SpanHandler)
-                       -> Session {
--    let host = match Target::search(config::host_triple()) {
-+    let sysroot = match sopts.maybe_sysroot {
-+        Some(ref x) => PathBuf::from(x),
-+        None => filesearch::get_or_default_sysroot()
-+    };
-+    let host = match Target::search(&sysroot, config::host_triple()) {
-         Ok(t) => t,
-         Err(e) => {
-             span_diagnostic.handler()
-                 .fatal(&format!("Error loading host specification: {}", e));
-     }
-     };
--    let target_cfg = config::build_target_config(&sopts, &span_diagnostic);
-+    let target_cfg = config::build_target_config(&sysroot, &sopts, &span_diagnostic);
-     let p_s = parse::ParseSess::with_span_handler(span_diagnostic);
-     let default_sysroot = match sopts.maybe_sysroot {
-         Some(_) => None,
-diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
-index ce05a88..1d1ff70 100644
---- a/src/librustc_back/target/mod.rs
-+++ b/src/librustc_back/target/mod.rs
-@@ -49,6 +49,8 @@ use serialize::json::Json;
- use std::default::Default;
- use std::io::prelude::*;
- use syntax::{diagnostic, abi};
-+use std::borrow::ToOwned;
-+use std::path::Path;
- 
- mod android_base;
- mod apple_base;
-@@ -320,12 +322,13 @@ impl Target {
-     ///
-     /// The error string could come from any of the APIs called, including
-     /// filesystem access and JSON decoding.
--    pub fn search(target: &str) -> Result<Target, String> {
-+    pub fn search(sysroot: &Path, target: &str) -> Result<Target, String> {
-         use std::env;
-         use std::ffi::OsString;
-         use std::fs::File;
-         use std::path::{Path, PathBuf};
-         use serialize::json;
-+        use std::iter::IntoIterator;
- 
-         fn load_file(path: &Path) -> Result<Target, String> {
-             let mut f = try!(File::open(path).map_err(|e| e.to_string()));
-@@ -417,9 +420,14 @@ impl Target {
-         let target_path = env::var_os("RUST_TARGET_PATH")
-                               .unwrap_or(OsString::new());
- 
--        // FIXME 16351: add a sane default search path?
-+        let mut default_path = sysroot.to_owned();
-+        default_path.push(env!("CFG_LIBDIR_RELATIVE"));
-+        default_path.push("rustlib");
- 
--        for dir in env::split_paths(&target_path) {
-+        let paths = env::split_paths(&target_path)
-+            .chain(Some(default_path).into_iter());
-+
-+        for dir in paths {
-             let p =  dir.join(&path);
-             if p.is_file() {
-                 return load_file(&p);
--- 
-2.5.1
-

recipes-devtools/rust/files/rust-1.3.0/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch

@@ -1,68 +0,0 @@
-From e468926e5e331dc6a68be5d0731a331940bd0199 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 18 Nov 2014 14:52:56 -0500
-Subject: [PATCH 03/10] mk: for stage0, use RUSTFLAGS to override target libs
- dir
-
-Setting HLIB specially for stage0 (and even more specially for windows)
-also affects the location we place TLIB. To keep the TLIBs we build in
-the place requested by configure, use '-L' and '--sysroot' to point
-stage0-rustc at the appropriate location.
----
- mk/main.mk | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/mk/main.mk b/mk/main.mk
-index 99b0797..d907628 100644
---- a/mk/main.mk
-+++ b/mk/main.mk
-@@ -369,21 +369,22 @@ define SREQ
- # Destinations of artifacts for the host compiler
- HROOT$(1)_H_$(3) = $(3)/stage$(1)
- HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
--ifeq ($$(CFG_WINDOWSY_$(3)),1)
--HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
--else
--ifeq ($(1),0)
--HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
--else
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
--endif
--endif
- 
- # Destinations of artifacts for target architectures
- TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
- TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
- TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
- 
-+# Don't trust stage0, be explicit about libraries
-+# TODO: rather than specifying sysroot, we really want to tell which libdir to
-+#       use (ie: the dir containing 'rustlib'). This would allow us to avoid
-+#       passing the '-L' options.
-+ifeq ($(1),0)
-+RUSTFLAGS_S_$(1)_T_$(2)_H_$(3) += --sysroot "$$(HROOT$(1)_H_$(3))" \
-+				  -L "$$(TLIB$(1)_T_$(2)_H_$(3))"
-+endif
-+
- # Preqrequisites for using the stageN compiler
- ifeq ($(1),0)
- HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
-@@ -495,6 +496,7 @@ STAGE$(1)_T_$(2)_H_$(3) := \
- 		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
- 		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
- 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
-+		$$(RUSTFLAGS_S_$(1)_T_$(2)_H_$(3)) \
-                 $$(RUSTC_FLAGS_$(2))
- 
- PERF_STAGE$(1)_T_$(2)_H_$(3) := \
-@@ -503,6 +505,7 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
- 		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
- 		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
- 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
-+		$$(RUSTFLAGS_S_$(1)_T_$(2)_H_$(3)) \
-                 $$(RUSTC_FLAGS_$(2))
- 
- endef
--- 
-2.5.1
-

recipes-devtools/rust/files/rust-1.3.0/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch

@@ -1,27 +0,0 @@
-From 977954fbe5a3c9d0b89652f852b174aa9ac0e0a4 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 18 Nov 2014 13:48:14 -0500
-Subject: [PATCH 04/10] mk: add missing CFG_LIBDIR_RELATIVE
-
----
- mk/grammar.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mk/grammar.mk b/mk/grammar.mk
-index d9c66e2..585206d 100644
---- a/mk/grammar.mk
-+++ b/mk/grammar.mk
-@@ -11,8 +11,8 @@
- BG = $(CFG_BUILD_DIR)/grammar/
- SG = $(S)src/grammar/
- B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/
--L = $(B)lib/rustlib/$(CFG_BUILD)/lib
--LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/
-+L = $(B)$(CFG_LIBDIR_RELATIVE)/rustlib/$(CFG_BUILD)/lib
-+LD = $(CFG_BUILD)/stage2/$(CFG_LIBDIR_RELATIVE)/rustlib/$(CFG_BUILD)/lib/
- RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD))
- ifeq ($(CFG_OSTYPE),apple-darwin)
- 	FLEX_LDFLAGS=-ll
--- 
-2.5.1
-

recipes-devtools/rust/files/rust-1.3.0/0007-mk-install-use-disable-rewrite-paths.patch

@@ -1,43 +0,0 @@
-From 564742fb9c94f9b8e7f6ad4ec34fd2254c337a09 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Mon, 2 Mar 2015 13:34:59 -0500
-Subject: [PATCH 07/10] mk/install: use disable-rewrite-paths
-
-This stops the install scripts from doing work we've already handled.
-
-Path rewriting is only useful for prepackaged binary installers.
----
- mk/install.mk | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mk/install.mk b/mk/install.mk
-index cabc97a..273bb0e 100644
---- a/mk/install.mk
-+++ b/mk/install.mk
-@@ -16,9 +16,9 @@ else
- 	$(Q)$(MAKE) prepare_install
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
-@@ -32,9 +32,9 @@ else
- 	$(Q)$(MAKE) prepare_uninstall
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
--- 
-2.5.1
-

recipes-devtools/rust/files/rust-1.3.0/0008-install-disable-ldconfig.patch

@@ -1,40 +0,0 @@
-From 24fc19c57309b0c23c34f22b87796bb8aee4efa7 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 26 May 2015 12:09:36 -0400
-Subject: [PATCH 08/10] install: disable ldconfig
-
----
- mk/install.mk | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mk/install.mk b/mk/install.mk
-index 273bb0e..58cfc99 100644
---- a/mk/install.mk
-+++ b/mk/install.mk
-@@ -16,9 +16,9 @@ else
- 	$(Q)$(MAKE) prepare_install
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths --disable-ldconfig
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths --disable-ldconfig
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
-@@ -32,9 +32,9 @@ else
- 	$(Q)$(MAKE) prepare_uninstall
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths --disable-ldconfig
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths --disable-ldconfig
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
--- 
-2.5.1
-

recipes-devtools/rust/files/rust-1.3.0/0010-mk-tell-rustc-that-we-re-only-looking-for-native-lib.patch

@@ -1,36 +0,0 @@
-From 053afad02e46b0cb62569018f07f7430ebf9afc5 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Wed, 26 Aug 2015 11:21:36 -0400
-Subject: [PATCH 10/10] mk: tell rustc that we're only looking for native libs
- in the LLVM_LIBDIR
-
-This fixes the case where we try to re-build & re-install rust to the
-same prefix (without uninstalling) while using an llvm-root that is the
-same as the prefix.
-
-Without this, builds like that fail with:
-	'error: multiple dylib candidates for `std` found'
-
-See https://github.com/jmesmon/meta-rust/issues/6 for some details.
-
-May also be related to #20342.
----
- mk/main.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/main.mk b/mk/main.mk
-index 6782bed..63b4fef 100644
---- a/mk/main.mk
-+++ b/mk/main.mk
-@@ -294,7 +294,7 @@ LLVM_VERSION_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --version)
- LLVM_BINDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --bindir)
- LLVM_INCDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --includedir)
- LLVM_LIBDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --libdir)
--LLVM_LIBDIR_RUSTFLAGS_$(1)=-L "$$(LLVM_LIBDIR_$(1))"
-+LLVM_LIBDIR_RUSTFLAGS_$(1)=-L native="$$(LLVM_LIBDIR_$(1))"
- LLVM_LDFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --ldflags)
- ifeq ($$(findstring freebsd,$(1)),freebsd)
- # On FreeBSD, it may search wrong headers (that are for pre-installed LLVM),
--- 
-2.5.1
-

recipes-devtools/rust/files/rust-git/0001-platform.mk-avoid-choking-on-i586.patch

@@ -1,27 +0,0 @@
-From 237f665afaf7ec35f067ede4c09a013e86ad12c4 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Sat, 15 Nov 2014 20:12:48 -0500
-Subject: [PATCH 1/8] platform.mk: avoid choking on i586
-
----
- mk/platform.mk | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mk/platform.mk b/mk/platform.mk
-index 8a5e58c..e2c3d8f 100644
---- a/mk/platform.mk
-+++ b/mk/platform.mk
-@@ -14,7 +14,9 @@
- # would create a variable HOST_i686-darwin-macos with the value
- # i386.
- define DEF_HOST_VAR
--  HOST_$(1) = $(subst i686,i386,$(word 1,$(subst -, ,$(1))))
-+  HOST_$(1) = $(subst i686,i386,\
-+    $(subst i586,i386,\
-+    $(word 1,$(subst -, ,$(1)))))
- endef
- $(foreach t,$(CFG_TARGET),$(eval $(call DEF_HOST_VAR,$(t))))
- $(foreach t,$(CFG_TARGET),$(info cfg: host for $(t) is $(HOST_$(t))))
--- 
-2.4.3
-

recipes-devtools/rust/files/rust-git/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch

@@ -1,362 +0,0 @@
-From 64dcf50a8a0f3aaf37ec6e4fe6143d0832592c05 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Mon, 24 Nov 2014 13:10:15 -0500
-Subject: [PATCH 5/8] configure: support --bindir, and extend libdir to
- non-blessed dirs
-
-Adds --bindir, and:
-
-Allows --bindir and --libdir to have multiple elements in their paths
-relative to sysroot, and allows libdir to end in an arbitrary directory
-(previously it was limited to lib, lib32, and lib64).
-
-Note that this assumes absolute paths start with '/', which may break
-windows platforms
----
- configure                           | 49 ++++++++++++++++------
- mk/host.mk                          |  6 ++-
- mk/main.mk                          | 11 +++++
- mk/perf.mk                          |  4 +-
- mk/prepare.mk                       |  4 +-
- src/librustc/metadata/filesearch.rs | 84 ++++++++++++++-----------------------
- src/librustc_trans/back/link.rs     |  3 +-
- 7 files changed, 90 insertions(+), 71 deletions(-)
-
-diff --git a/configure b/configure
-index 891f524..441793c 100755
---- a/configure
-+++ b/configure
-@@ -323,6 +323,31 @@ envopt() {
-     fi
- }
- 
-+abspath () {
-+	case "$1" in
-+	/*) echo "$1" ;;
-+	*)  echo "$PWD/$1" ;;
-+	esac
-+}
-+
-+relpath () {
-+	local src=$(abspath "$1")
-+	local dst=$(abspath "$2")
-+	local common=$src
-+	local result=
-+
-+	# Start by checking if the whole src is common, then strip off pack
-+	# components until we find the common element.
-+	while [ "${dst#"$common"}" = "$dst" ]; do
-+		common=$(dirname "$common")
-+		result="../$result"
-+	done
-+
-+	local down="${dst#"$common"}"
-+	result="${result}${down#/}"
-+	echo "$result"
-+}
-+
- to_llvm_triple() {
-     case $1 in
-         i686-w64-mingw32) echo i686-pc-windows-gnu ;;
-@@ -609,6 +634,8 @@ putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
- CFG_HOST=$(to_llvm_triple $CFG_HOST)
- CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
- 
-+CFG_LIBDIR_RELATIVE=lib
-+
- # On windows we just store the libraries in the bin directory because
- # there's no rpath. This is where the build system itself puts libraries;
- # --libdir is used to configure the installation directory.
-@@ -616,24 +643,21 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
- if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ]
- then
-     CFG_LIBDIR_RELATIVE=bin
--else
--    CFG_LIBDIR_RELATIVE=lib
- fi
- 
--valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries (do not set it on windows platform)"
-+valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
- 
--case "$CFG_LIBDIR" in
--    "$CFG_PREFIX"/*) CAT_INC=2;;
--    "$CFG_PREFIX"*)  CAT_INC=1;;
--    *)
--        err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
--esac
-+CFG_BINDIR_RELATIVE=bin
-+valopt bindir "${CFG_PREFIX}/${CFG_BINDIR_RELATIVE}" "install binaries"
- 
--CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-+# Determine libdir and bindir relative to prefix
-+step_msg "calculating relative paths to prefix = ${CFG_PREFIX}"
-+CFG_BINDIR_RELATIVE=$(relpath "${CFG_PREFIX}" "${CFG_BINDIR}")
-+CFG_LIBDIR_RELATIVE=$(relpath "${CFG_PREFIX}" "${CFG_LIBDIR}")
- 
- if ( [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ] ) \
--	&& [ "$CFG_LIBDIR_RELATIVE" != "bin" ]; then
--    err "libdir on windows should be set to 'bin'"
-+    && [ "$CFG_LIBDIR_RELATIVE" != "$CFG_BINDIR_RELATIVE" ]; then
-+  err "Windows builds currently require that LIBDIR == BINDIR (we have libdir{$CFG_LIBDIR_RELATIVE} != bindir{$CFG_BINDIR_RELATIVE} )"
- fi
- 
- if [ $HELP -eq 1 ]
-@@ -1588,6 +1612,7 @@ putvar CFG_PREFIX
- putvar CFG_HOST
- putvar CFG_TARGET
- putvar CFG_LIBDIR_RELATIVE
-+putvar CFG_BINDIR_RELATIVE
- putvar CFG_DISABLE_MANAGE_SUBMODULES
- putvar CFG_ANDROID_CROSS_PATH
- putvar CFG_MANDIR
-diff --git a/mk/host.mk b/mk/host.mk
-index 59a0095..b8e8345 100644
---- a/mk/host.mk
-+++ b/mk/host.mk
-@@ -59,9 +59,13 @@ endef
- # $(4) - the host triple (same as $(3))
- define CP_HOST_STAGE_N
- 
--ifneq ($(CFG_LIBDIR_RELATIVE),bin)
- $$(HLIB$(2)_H_$(4))/:
- 	@mkdir -p $$@
-+
-+# Avoid redefinition warnings if libdir==bindir
-+ifneq ($(HBIN$(2)_H_$(4)),$(HLIB$(2)_H_$(4)))
-+$$(HBIN$(2)_H_$(4))/:
-+	@mkdir -p $$@
- endif
- 
- endef
-diff --git a/mk/main.mk b/mk/main.mk
-index 165afc3..33f9545 100644
---- a/mk/main.mk
-+++ b/mk/main.mk
-@@ -339,7 +339,9 @@ export CFG_RELEASE_CHANNEL
- export CFG_LLVM_ROOT
- export CFG_PREFIX
- export CFG_LIBDIR
-+export CFG_BINDIR
- export CFG_LIBDIR_RELATIVE
-+export CFG_BINDIR_RELATIVE
- export CFG_DISABLE_INJECT_STD_VERSION
- ifdef CFG_DISABLE_UNSTABLE_FEATURES
- CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
-@@ -369,7 +371,16 @@ define SREQ
- 
- # Destinations of artifacts for the host compiler
- HROOT$(1)_H_$(3) = $(3)/stage$(1)
-+
-+ifeq ($(1)-$(3),0-$$(CFG_BUILD))
-+# stage0 relative paths are fixed so we can bootstrap from snapshots
-+# (downloaded snapshots drop their rustc in HROOT/bin)
-+# libdir discrepancy is worked around with RUSTFLAGS below.
- HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-+else
-+HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_BINDIR_RELATIVE)
-+endif
-+
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
- 
- # Destinations of artifacts for target architectures
-diff --git a/mk/perf.mk b/mk/perf.mk
-index 16cbaab..f8a354c 100644
---- a/mk/perf.mk
-+++ b/mk/perf.mk
-@@ -10,13 +10,13 @@
- 
- 
- ifdef CFG_PERF_TOOL
--rustc-perf$(X): $(CFG_BUILD)/stage2/bin/rustc$(X_$(CFG_BUILD))
-+rustc-perf$(X): $(CFG_BUILD)/stage2/$(CFG_BINDIR_RELATIVE)/rustc$(X_$(CFG_BUILD))
- 	@$(call E, perf compile: $@)
- 	$(PERF_STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
- 		 -o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
- 	$(Q)rm -f $(LIBRUSTC_GLOB)
- else
--rustc-perf$(X): $(CFG_BUILD)/stage2/bin/rustc$(X_$(CFG_BUILD))
-+rustc-perf$(X): $(CFG_BUILD)/stage2/$(CFG_BINDIR_RELATIVE)/rustc$(X_$(CFG_BUILD))
- 	$(Q)touch $@
- endif
- 
-diff --git a/mk/prepare.mk b/mk/prepare.mk
-index fe619cc..b8aa0cb 100644
---- a/mk/prepare.mk
-+++ b/mk/prepare.mk
-@@ -186,10 +186,10 @@ INSTALL_DEBUGGER_SCRIPT_COMMANDS=$(if $(findstring windows,$(1)),\
- define DEF_PREPARE
- 
- prepare-base-$(1): PREPARE_SOURCE_DIR=$$(PREPARE_HOST)/stage$$(PREPARE_STAGE)
--prepare-base-$(1): PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_DIR)/bin
-+prepare-base-$(1): PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_DIR)/$$(CFG_BINDIR_RELATIVE)
- prepare-base-$(1): PREPARE_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_DIR)/$$(CFG_LIBDIR_RELATIVE)
- prepare-base-$(1): PREPARE_SOURCE_MAN_DIR=$$(S)/man
--prepare-base-$(1): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/bin
-+prepare-base-$(1): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_BINDIR_RELATIVE)
- prepare-base-$(1): PREPARE_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)
- prepare-base-$(1): PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
- prepare-base-$(1): prepare-everything-$(1)
-diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs
-index 311ab1c..1b03b1a 100644
---- a/src/librustc/metadata/filesearch.rs
-+++ b/src/librustc/metadata/filesearch.rs
-@@ -68,8 +68,7 @@ impl<'a> FileSearch<'a> {
-         if !found {
-             let rustpath = rust_path();
-             for path in &rustpath {
--                let tlib_path = make_rustpkg_lib_path(
--                    self.sysroot, path, self.triple);
-+                let tlib_path = make_rustpkg_lib_path(path, self.triple);
-                 debug!("is {} in visited_dirs? {}", tlib_path.display(),
-                         visited_dirs.contains(&tlib_path));
- 
-@@ -96,7 +95,7 @@ impl<'a> FileSearch<'a> {
-         where F: FnMut(&Path, PathKind) -> FileMatch
-     {
-         self.for_each_lib_search_path(|lib_search_path, kind| {
--            debug!("searching {}", lib_search_path.display());
-+            info!("searching {}", lib_search_path.display());
-             match fs::read_dir(lib_search_path) {
-                 Ok(files) => {
-                     let files = files.filter_map(|p| p.ok().map(|s| s.path()))
-@@ -157,7 +156,7 @@ impl<'a> FileSearch<'a> {
-     // Returns a list of directories where target-specific tool binaries are located.
-     pub fn get_tools_search_paths(&self) -> Vec<PathBuf> {
-         let mut p = PathBuf::from(self.sysroot);
--        p.push(&find_libdir(self.sysroot));
-+        p.push(libdir_str());
-         p.push(&rustlibdir());
-         p.push(&self.triple);
-         p.push("bin");
-@@ -165,8 +164,8 @@ impl<'a> FileSearch<'a> {
-     }
- }
- 
--pub fn relative_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf {
--    let mut p = PathBuf::from(&find_libdir(sysroot));
-+pub fn relative_target_lib_path(target_triple: &str) -> PathBuf {
-+    let mut p = PathBuf::from(&libdir_str());
-     assert!(p.is_relative());
-     p.push(&rustlibdir());
-     p.push(target_triple);
-@@ -176,17 +175,28 @@ pub fn relative_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf
- 
- fn make_target_lib_path(sysroot: &Path,
-                         target_triple: &str) -> PathBuf {
--    sysroot.join(&relative_target_lib_path(sysroot, target_triple))
-+    sysroot.join(&relative_target_lib_path(target_triple))
- }
- 
--fn make_rustpkg_lib_path(sysroot: &Path,
--                         dir: &Path,
-+fn make_rustpkg_lib_path(dir: &Path,
-                          triple: &str) -> PathBuf {
--    let mut p = dir.join(&find_libdir(sysroot));
-+    let mut p = dir.join(libdir_str());
-     p.push(triple);
-     p
- }
- 
-+pub fn bindir_relative_str() -> &'static str {
-+    env!("CFG_BINDIR_RELATIVE")
-+}
-+
-+pub fn bindir_relative_path() -> PathBuf {
-+    PathBuf::from(bindir_relative_str())
-+}
-+
-+pub fn libdir_str() -> &'static str {
-+    env!("CFG_LIBDIR_RELATIVE")
-+}
-+
- pub fn get_or_default_sysroot() -> PathBuf {
-     // Follow symlinks.  If the resolved path is relative, make it absolute.
-     fn canonicalize(path: Option<PathBuf>) -> Option<PathBuf> {
-@@ -202,7 +212,18 @@ pub fn get_or_default_sysroot() -> PathBuf {
-     }
- 
-     match canonicalize(env::current_exe().ok()) {
--        Some(mut p) => { p.pop(); p.pop(); p }
-+        Some(mut p) => {
-+            // Remove the exe name
-+            p.pop();
-+            let mut rel = bindir_relative_path();
-+
-+            // Remove a number of elements equal to the number of elements in the bindir relative
-+            // path
-+            while rel.pop() {
-+                p.pop();
-+            }
-+            p
-+        }
-         None => panic!("can't determine value for sysroot")
-     }
- }
-@@ -257,47 +278,6 @@ pub fn rust_path() -> Vec<PathBuf> {
-     env_rust_path
- }
- 
--// The name of the directory rustc expects libraries to be located.
--// On Unix should be "lib", on windows "bin"
--#[cfg(unix)]
--fn find_libdir(sysroot: &Path) -> String {
--    // FIXME: This is a quick hack to make the rustc binary able to locate
--    // Rust libraries in Linux environments where libraries might be installed
--    // to lib64/lib32. This would be more foolproof by basing the sysroot off
--    // of the directory where librustc is located, rather than where the rustc
--    // binary is.
--    //If --libdir is set during configuration to the value other than
--    // "lib" (i.e. non-default), this value is used (see issue #16552).
--
--    match option_env!("CFG_LIBDIR_RELATIVE") {
--        Some(libdir) if libdir != "lib" => return libdir.to_string(),
--        _ => if sysroot.join(&primary_libdir_name()).join(&rustlibdir()).exists() {
--            return primary_libdir_name();
--        } else {
--            return secondary_libdir_name();
--        }
--    }
--
--    #[cfg(target_pointer_width = "64")]
--    fn primary_libdir_name() -> String {
--        "lib64".to_string()
--    }
--
--    #[cfg(target_pointer_width = "32")]
--    fn primary_libdir_name() -> String {
--        "lib32".to_string()
--    }
--
--    fn secondary_libdir_name() -> String {
--        "lib".to_string()
--    }
--}
--
--#[cfg(windows)]
--fn find_libdir(_sysroot: &Path) -> String {
--    "bin".to_string()
--}
--
- // The name of rustc's own place to organize libraries.
- // Used to be "rustc", now the default is "rustlib"
- pub fn rustlibdir() -> String {
-diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 6b8b59d..6e03f3c 100644
---- a/src/librustc_trans/back/link.rs
-+++ b/src/librustc_trans/back/link.rs
-@@ -997,11 +997,10 @@ fn link_args(cmd: &mut Linker,
-     // where extern libraries might live, based on the
-     // addl_lib_search_paths
-     if sess.opts.cg.rpath {
--        let sysroot = sess.sysroot();
-         let target_triple = &sess.opts.target_triple;
-         let mut get_install_prefix_lib_path = || {
-             let install_prefix = option_env!("CFG_PREFIX").expect("CFG_PREFIX");
--            let tlib = filesearch::relative_target_lib_path(sysroot, target_triple);
-+            let tlib = filesearch::relative_target_lib_path(target_triple);
-             let mut path = PathBuf::from(install_prefix);
-             path.push(&tlib);
- 
--- 
-2.4.3
-

recipes-devtools/rust/files/rust-git/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch

@@ -1,25 +0,0 @@
-From fb56f1fa6d0bdc62f7fd0c480446255698dc1635 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Wed, 3 Dec 2014 19:15:19 -0500
-Subject: [PATCH 6/8] std/thread_local: workaround for NULL __dso_handle
-
----
- src/libstd/thread/local.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
-index 6056334..e79bd8b 100644
---- a/src/libstd/thread/local.rs
-+++ b/src/libstd/thread/local.rs
-@@ -337,7 +337,7 @@ mod imp {
-             #[linkage = "extern_weak"]
-             static __cxa_thread_atexit_impl: *const ();
-         }
--        if !__cxa_thread_atexit_impl.is_null() {
-+        if !__cxa_thread_atexit_impl.is_null() && !__dso_handle.is_null() {
-             type F = unsafe extern fn(dtor: unsafe extern fn(*mut u8),
-                                       arg: *mut u8,
-                                       dso_handle: *mut u8) -> libc::c_int;
--- 
-2.4.3
-

recipes-devtools/rust/files/rust-git/0007-mk-install-use-disable-rewrite-paths.patch

@@ -1,43 +0,0 @@
-From de01acf6395a4c7f7d5c9d7ba251d9f2af570127 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Mon, 2 Mar 2015 13:34:59 -0500
-Subject: [PATCH 7/8] mk/install: use disable-rewrite-paths
-
-This stops the install scripts from doing work we've already handled.
-
-Path rewriting is only useful for prepackaged binary installers.
----
- mk/install.mk | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mk/install.mk b/mk/install.mk
-index cabc97a..273bb0e 100644
---- a/mk/install.mk
-+++ b/mk/install.mk
-@@ -16,9 +16,9 @@ else
- 	$(Q)$(MAKE) prepare_install
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
-@@ -32,9 +32,9 @@ else
- 	$(Q)$(MAKE) prepare_uninstall
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
--- 
-2.4.3
-

recipes-devtools/rust/files/rust-git/0008-install-disable-ldconfig.patch

@@ -1,40 +0,0 @@
-From 8b87c3e5a7181f828dee1c8c0598b1bafa9dd4cc Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 26 May 2015 12:09:36 -0400
-Subject: [PATCH 8/8] install: disable ldconfig
-
----
- mk/install.mk | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mk/install.mk b/mk/install.mk
-index 273bb0e..58cfc99 100644
---- a/mk/install.mk
-+++ b/mk/install.mk
-@@ -16,9 +16,9 @@ else
- 	$(Q)$(MAKE) prepare_install
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths --disable-ldconfig
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)" --disable-rewrite-paths --disable-ldconfig
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
-@@ -32,9 +32,9 @@ else
- 	$(Q)$(MAKE) prepare_uninstall
- endif
- ifeq ($(CFG_DISABLE_DOCS),)
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths --disable-ldconfig
- endif
--	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths
-+	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" --disable-rewrite-paths --disable-ldconfig
- # Remove tmp files because it's a decent amount of disk space
- 	$(Q)rm -R tmp/dist
- 
--- 
-2.4.3
-

recipes-devtools/rust/files/rust-llvm/0000-rust-llvm-remove-extra-slash.patch

@@ -0,0 +1,11 @@
++++ llvm/src/llvm/include/llvm/CodeGen/CommandFlags.h.orig	2016-01-18 19:18:03.847470845 +0000
++++ llvm/src/llvm/include/llvm/CodeGen/CommandFlags.h	2016-01-18 19:18:11.211408270 +0000
+@@ -21,7 +21,7 @@
+ #include "llvm/IR/Intrinsics.h"
+ #include "llvm/IR/Module.h"
+ #include "llvm/MC/MCTargetOptionsCommandFlags.h"
+-#include "llvm//MC/SubtargetFeature.h"
++#include "llvm/MC/SubtargetFeature.h"
+ #include "llvm/Support/CodeGen.h"
+ #include "llvm/Support/CommandLine.h"
+ #include "llvm/Support/Host.h"

recipes-devtools/rust/files/rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch

@@ -1,20 +1,20 @@
-From 221ff5acf7b3b176882908d2f7010784614005e8 Mon Sep 17 00:00:00 2001
+From 3237afb78f960c015025186166f1c0998c00c6a6 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 01:40:21 -0500
-Subject: [PATCH 2/8] Target: add default target.json path:
+Subject: [PATCH 2/9] Target: add default target.json path:
  $libdir/rust/targets
 
 ---
  src/librustc/session/config.rs  |  6 +++---
  src/librustc/session/mod.rs     |  8 ++++++--
- src/librustc_back/target/mod.rs | 14 +++++++++++---
- 3 files changed, 20 insertions(+), 8 deletions(-)
+ src/librustc_back/target/mod.rs | 13 +++++++++++--
+ 3 files changed, 20 insertions(+), 7 deletions(-)
 
 diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
-index c6ce3a2..51152c7 100644
+index c4697eb..4cc059b 100644
 --- a/src/librustc/session/config.rs
 +++ b/src/librustc/session/config.rs
-@@ -38,7 +38,7 @@ use getopts;
+@@ -35,7 +35,7 @@ use getopts;
  use std::collections::HashMap;
  use std::env;
  use std::fmt;
@@ -23,24 +23,24 @@ index c6ce3a2..51152c7 100644
  
  use llvm;
  
-@@ -651,8 +651,8 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
+@@ -711,8 +711,8 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
      v
  }
  
--pub fn build_target_config(opts: &Options, sp: &SpanHandler) -> Config {
+-pub fn build_target_config(opts: &Options, sp: &Handler) -> Config {
 -    let target = match Target::search(&opts.target_triple) {
-+pub fn build_target_config(sysroot: &Path, opts: &Options, sp: &SpanHandler) -> Config {
++pub fn build_target_config(sysroot: &Path, opts: &Options, sp: &Handler) -> Config {
 +    let target = match Target::search(sysroot, &opts.target_triple[..]) {
          Ok(t) => t,
          Err(e) => {
-             sp.handler().fatal(&format!("Error loading target specification: {}", e));
+             panic!(sp.fatal(&format!("Error loading target specification: {}", e)));
 diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
-index 6b5f587..4432440 100644
+index 2f3af1c..6424cff 100644
 --- a/src/librustc/session/mod.rs
 +++ b/src/librustc/session/mod.rs
-@@ -381,14 +381,18 @@ pub fn build_session_(sopts: config::Options,
-                       local_crate_source_file: Option<PathBuf>,
-                       span_diagnostic: diagnostic::SpanHandler)
+@@ -429,13 +429,17 @@ pub fn build_session_(sopts: config::Options,
+                       codemap: Rc<codemap::CodeMap>,
+                       cstore: Rc<for<'a> CrateStore<'a>>)
                        -> Session {
 -    let host = match Target::search(config::host_triple()) {
 +    let sysroot = match sopts.maybe_sysroot {
@@ -50,29 +50,28 @@ index 6b5f587..4432440 100644
 +    let host = match Target::search(&sysroot, config::host_triple()) {
          Ok(t) => t,
          Err(e) => {
-             span_diagnostic.handler()
-                 .fatal(&format!("Error loading host specification: {}", e));
+             panic!(span_diagnostic.fatal(&format!("Error loading host specification: {}", e)));
      }
      };
 -    let target_cfg = config::build_target_config(&sopts, &span_diagnostic);
 +    let target_cfg = config::build_target_config(&sysroot, &sopts, &span_diagnostic);
-     let p_s = parse::ParseSess::with_span_handler(span_diagnostic);
+     let p_s = parse::ParseSess::with_span_handler(span_diagnostic, codemap);
      let default_sysroot = match sopts.maybe_sysroot {
          Some(_) => None,
 diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
-index 402fbcd..a211b84 100644
+index 5114910..636a1aa 100644
 --- a/src/librustc_back/target/mod.rs
 +++ b/src/librustc_back/target/mod.rs
 @@ -49,6 +49,8 @@ use serialize::json::Json;
  use std::default::Default;
  use std::io::prelude::*;
- use syntax::{diagnostic, abi};
+ use syntax::abi;
 +use std::borrow::ToOwned;
 +use std::path::Path;
  
  mod android_base;
  mod apple_base;
-@@ -306,12 +308,13 @@ impl Target {
+@@ -366,12 +368,13 @@ impl Target {
      ///
      /// The error string could come from any of the APIs called, including
      /// filesystem access and JSON decoding.
@@ -87,11 +86,10 @@ index 402fbcd..a211b84 100644
  
          fn load_file(path: &Path) -> Result<Target, String> {
              let mut f = try!(File::open(path).map_err(|e| e.to_string()));
-@@ -400,9 +403,14 @@ impl Target {
-         let target_path = env::var_os("RUST_TARGET_PATH")
+@@ -470,8 +473,14 @@ impl Target {
                                .unwrap_or(OsString::new());
  
--        // FIXME 16351: add a sane default search path?
+         // FIXME 16351: add a sane default search path?
 +        let mut default_path = sysroot.to_owned();
 +        default_path.push(env!("CFG_LIBDIR_RELATIVE"));
 +        default_path.push("rustlib");
@@ -105,5 +103,5 @@ index 402fbcd..a211b84 100644
              if p.is_file() {
                  return load_file(&p);
 -- 
-2.4.3
+2.4.10
 

recipes-devtools/rust/files/rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch

@@ -1,36 +1,48 @@
-From 057d6be30ff1437a53132175720c96fa93826a08 Mon Sep 17 00:00:00 2001
+From 3254ad1d84b177eb960219c2bce26f8980a511e1 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 14:52:56 -0500
-Subject: [PATCH 3/8] mk: for stage0, use RUSTFLAGS to override target libs dir
+Subject: [PATCH 3/9] mk: for stage0, use RUSTFLAGS to override target libs dir
 
 Setting HLIB specially for stage0 (and even more specially for windows)
 also affects the location we place TLIB. To keep the TLIBs we build in
 the place requested by configure, use '-L' and '--sysroot' to point
 stage0-rustc at the appropriate location.
 ---
- mk/main.mk | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
+ mk/main.mk | 30 +++++++++++++-----------------
+ 1 file changed, 13 insertions(+), 17 deletions(-)
 
 diff --git a/mk/main.mk b/mk/main.mk
-index 3926119..165afc3 100644
+index 963c12f..04b3e25 100644
 --- a/mk/main.mk
 +++ b/mk/main.mk
-@@ -370,21 +370,22 @@ define SREQ
- # Destinations of artifacts for the host compiler
+@@ -383,32 +383,26 @@ define SREQ
  HROOT$(1)_H_$(3) = $(3)/stage$(1)
  HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
+ 
 -ifeq ($$(CFG_WINDOWSY_$(3)),1)
--HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
--else
+-# On Windows we always store host runtime libraries in the 'bin' directory because
+-# there's no rpath. Target libraries go under $CFG_LIBDIR_RELATIVE (usually 'lib').
+-HLIB_RELATIVE$(1)_H_$(3) = bin
+-TROOT$(1)_T_$(2)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)/rustlib/$(2)
+-# Remove the next 3 lines after a snapshot
 -ifeq ($(1),0)
--HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
+-RUSTFLAGS_STAGE0 += -L $$(TROOT$(1)_T_$(2)_H_$(3))/lib
+-endif
+-
 -else
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
+-
+-ifeq ($(1),0)
+-HLIB_RELATIVE$(1)_H_$(3) = lib
+-else
+ HLIB_RELATIVE$(1)_H_$(3) = $$(CFG_LIBDIR_RELATIVE)
 -endif
++
+ TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
+ 
 -endif
+ HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(HLIB_RELATIVE$(1)_H_$(3))
  
  # Destinations of artifacts for target architectures
- TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
  TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
  TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
  
@@ -42,11 +54,12 @@ index 3926119..165afc3 100644
 +RUSTFLAGS_S_$(1)_T_$(2)_H_$(3) += --sysroot "$$(HROOT$(1)_H_$(3))" \
 +				  -L "$$(TLIB$(1)_T_$(2)_H_$(3))"
 +endif
++
 +
  # Preqrequisites for using the stageN compiler
  ifeq ($(1),0)
  HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
-@@ -496,6 +497,7 @@ STAGE$(1)_T_$(2)_H_$(3) := \
+@@ -520,6 +514,7 @@ STAGE$(1)_T_$(2)_H_$(3) := \
  		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
  		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
  		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
@@ -54,7 +67,7 @@ index 3926119..165afc3 100644
                  $$(RUSTC_FLAGS_$(2))
  
  PERF_STAGE$(1)_T_$(2)_H_$(3) := \
-@@ -504,6 +506,7 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
+@@ -528,6 +523,7 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
  		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
  		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
  		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
@@ -63,5 +76,5 @@ index 3926119..165afc3 100644
  
  endef
 -- 
-2.4.3
+2.4.10
 

recipes-devtools/rust/files/rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch

@@ -1,14 +1,14 @@
-From af95f47a39a91a3e4a58b1df6c48bc4e010520c6 Mon Sep 17 00:00:00 2001
+From 004ddead436887fe99bfa9d0d25f6cdaf9f6148b Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 13:48:14 -0500
-Subject: [PATCH 4/8] mk: add missing CFG_LIBDIR_RELATIVE
+Subject: [PATCH 4/9] mk: add missing CFG_LIBDIR_RELATIVE
 
 ---
  mk/grammar.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mk/grammar.mk b/mk/grammar.mk
-index d9c66e2..585206d 100644
+index 0d527bd..926f247 100644
 --- a/mk/grammar.mk
 +++ b/mk/grammar.mk
 @@ -11,8 +11,8 @@
@@ -23,5 +23,5 @@ index d9c66e2..585206d 100644
  ifeq ($(CFG_OSTYPE),apple-darwin)
  	FLEX_LDFLAGS=-ll
 -- 
-2.4.3
+2.4.10
 

recipes-devtools/rust/files/rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch

@@ -1,7 +1,7 @@
-From 08aecf1062fd85207e9b5c688b84def523eb05a0 Mon Sep 17 00:00:00 2001
+From 93ef6b8b93c7695280aba7f3541bf8f1ae18c722 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Mon, 24 Nov 2014 13:10:15 -0500
-Subject: [PATCH 05/10] configure: support --bindir, and extend libdir to
+Subject: [PATCH 5/9] configure: support --bindir, and extend libdir to
  non-blessed dirs
 
 Adds --bindir, and:
@@ -13,20 +13,20 @@ relative to sysroot, and allows libdir to end in an arbitrary directory
 Note that this assumes absolute paths start with '/', which may break
 windows platforms
 ---
- configure                           | 49 ++++++++++++++++------
- mk/host.mk                          |  6 ++-
- mk/main.mk                          | 11 +++++
- mk/perf.mk                          |  4 +-
- mk/prepare.mk                       |  4 +-
- src/librustc/metadata/filesearch.rs | 84 ++++++++++++++-----------------------
- src/librustc_trans/back/link.rs     |  3 +-
- 7 files changed, 90 insertions(+), 71 deletions(-)
+ configure                          | 44 ++++++++++++++++++++-----
+ mk/host.mk                         |  6 +++-
+ mk/main.mk                         | 11 +++++++
+ mk/perf.mk                         |  4 +--
+ mk/prepare.mk                      | 27 +++++++---------
+ src/librustc/session/filesearch.rs | 66 ++++++++++++++++----------------------
+ src/librustc_trans/back/link.rs    |  3 +-
+ 7 files changed, 94 insertions(+), 67 deletions(-)
 
 diff --git a/configure b/configure
-index 2c8d785..d214382 100755
+index 287b7b3..7d53a66 100755
 --- a/configure
 +++ b/configure
-@@ -334,6 +334,31 @@ enable_if_not_disabled() {
+@@ -334,6 +334,32 @@ enable_if_not_disabled() {
      fi
  }
  
@@ -54,28 +54,20 @@ index 2c8d785..d214382 100755
 +	result="${result}${down#/}"
 +	echo "$result"
 +}
++
 +
  to_llvm_triple() {
      case $1 in
          i686-w64-mingw32) echo i686-pc-windows-gnu ;;
-@@ -626,6 +651,8 @@ putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
+@@ -652,18 +678,19 @@ putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
  CFG_HOST=$(to_llvm_triple $CFG_HOST)
  CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
  
 +CFG_LIBDIR_RELATIVE=lib
 +
- # On windows we just store the libraries in the bin directory because
- # there's no rpath. This is where the build system itself puts libraries;
- # --libdir is used to configure the installation directory.
-@@ -633,24 +660,21 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
- if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ]
- then
-     CFG_LIBDIR_RELATIVE=bin
--else
--    CFG_LIBDIR_RELATIVE=lib
- fi
- 
--valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries (do not set it on windows platform)"
+ # On Windows this determines root of the subtree for target libraries.
+ # Host runtime libs always go to 'bin'.
+-valopt libdir "${CFG_PREFIX}/lib" "install libraries"
 +valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
  
 -case "$CFG_LIBDIR" in
@@ -93,15 +85,9 @@ index 2c8d785..d214382 100755
 +CFG_BINDIR_RELATIVE=$(relpath "${CFG_PREFIX}" "${CFG_BINDIR}")
 +CFG_LIBDIR_RELATIVE=$(relpath "${CFG_PREFIX}" "${CFG_LIBDIR}")
  
- if ( [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ] ) \
--	&& [ "$CFG_LIBDIR_RELATIVE" != "bin" ]; then
--    err "libdir on windows should be set to 'bin'"
-+    && [ "$CFG_LIBDIR_RELATIVE" != "$CFG_BINDIR_RELATIVE" ]; then
-+  err "Windows builds currently require that LIBDIR == BINDIR (we have libdir{$CFG_LIBDIR_RELATIVE} != bindir{$CFG_BINDIR_RELATIVE} )"
- fi
- 
  if [ $HELP -eq 1 ]
-@@ -1685,6 +1709,7 @@ putvar CFG_PREFIX
+ then
+@@ -1760,6 +1787,7 @@ putvar CFG_PREFIX
  putvar CFG_HOST
  putvar CFG_TARGET
  putvar CFG_LIBDIR_RELATIVE
@@ -129,10 +115,10 @@ index 59a0095..b8e8345 100644
  
  endef
 diff --git a/mk/main.mk b/mk/main.mk
-index d907628..6782bed 100644
+index 04b3e25..ba11e5e 100644
 --- a/mk/main.mk
 +++ b/mk/main.mk
-@@ -338,7 +338,9 @@ export CFG_RELEASE_CHANNEL
+@@ -351,7 +351,9 @@ export CFG_RELEASE_CHANNEL
  export CFG_LLVM_ROOT
  export CFG_PREFIX
  export CFG_LIBDIR
@@ -142,7 +128,7 @@ index d907628..6782bed 100644
  export CFG_DISABLE_INJECT_STD_VERSION
  ifdef CFG_DISABLE_UNSTABLE_FEATURES
  CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
-@@ -368,7 +370,16 @@ define SREQ
+@@ -381,7 +383,16 @@ define SREQ
  
  # Destinations of artifacts for the host compiler
  HROOT$(1)_H_$(3) = $(3)/stage$(1)
@@ -156,9 +142,9 @@ index d907628..6782bed 100644
 +HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_BINDIR_RELATIVE)
 +endif
 +
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
  
- # Destinations of artifacts for target architectures
+ HLIB_RELATIVE$(1)_H_$(3) = $$(CFG_LIBDIR_RELATIVE)
+ 
 diff --git a/mk/perf.mk b/mk/perf.mk
 index 16cbaab..f8a354c 100644
 --- a/mk/perf.mk
@@ -180,46 +166,70 @@ index 16cbaab..f8a354c 100644
  endif
  
 diff --git a/mk/prepare.mk b/mk/prepare.mk
-index fe619cc..b8aa0cb 100644
+index 87a4450..c358bbc 100644
 --- a/mk/prepare.mk
 +++ b/mk/prepare.mk
-@@ -186,10 +186,10 @@ INSTALL_DEBUGGER_SCRIPT_COMMANDS=$(if $(findstring windows,$(1)),\
+@@ -90,8 +90,6 @@ PREPARE_TOOLS = $(filter-out compiletest rustbook error-index-generator, $(TOOLS
+ # $(3) is host
+ # $(4) tag
+ define DEF_PREPARE_HOST_TOOL
+-prepare-host-tool-$(1)-$(2)-$(3)-$(4): \
+-	PREPARE_SOURCE_BIN_DIR=$$(HBIN$(2)_H_$(3))
+ prepare-host-tool-$(1)-$(2)-$(3)-$(4): prepare-maybe-clean-$(4) \
+                                   $$(foreach dep,$$(TOOL_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3)-$(4)) \
+                                   $$(HBIN$(2)_H_$(3))/$(1)$$(X_$(3)) \
+@@ -117,10 +115,8 @@ PREPARE_TAR_LIB_DIR = $(patsubst $(CFG_LIBDIR_RELATIVE)%,lib%,$(1))
+ # $(3) is host
+ # $(4) tag
+ define DEF_PREPARE_HOST_LIB
+-prepare-host-lib-$(1)-$(2)-$(3)-$(4): \
+-	PREPARE_WORKING_SOURCE_LIB_DIR=$$(HLIB$(2)_H_$(3))
+-prepare-host-lib-$(1)-$(2)-$(3)-$(4): \
+-	PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(call PREPARE_TAR_LIB_DIR,$$(HLIB_RELATIVE$(2)_H_$(3)))
++prepare-host-lib-$(1)-$(2)-$(3)-$(4): PREPARE_WORKING_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_LIB_DIR)
++prepare-host-lib-$(1)-$(2)-$(3)-$(4): PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_LIB_DIR)
+ prepare-host-lib-$(1)-$(2)-$(3)-$(4): prepare-maybe-clean-$(4) \
+                                  $$(foreach dep,$$(RUST_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3)-$(4)) \
+                                  $$(HLIB$(2)_H_$(3))/stamp.$(1) \
+@@ -138,14 +134,10 @@ endef
+ # $(4) tag
+ define DEF_PREPARE_TARGET_N
+ # Rebind PREPARE_*_LIB_DIR to point to rustlib, then install the libs for the targets
+-prepare-target-$(2)-host-$(3)-$(1)-$(4): \
+-	PREPARE_WORKING_SOURCE_LIB_DIR=$$(TLIB$(1)_T_$(2)_H_$(3))
+-prepare-target-$(2)-host-$(3)-$(1)-$(4): \
+-	PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_LIB_DIR)/rustlib/$(2)/lib
+-prepare-target-$(2)-host-$(3)-$(1)-$(4): \
+-	PREPARE_SOURCE_BIN_DIR=$$(TBIN$(1)_T_$(2)_H_$(3))
+-prepare-target-$(2)-host-$(3)-$(1)-$(4): \
+-	PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_LIB_DIR)/rustlib/$(3)/bin
++prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_WORKING_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_LIB_DIR)/rustlib/$(2)/lib
++prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_LIB_DIR)/rustlib/$(2)/lib
++prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_LIB_DIR)/rustlib/$(3)/bin
++prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_LIB_DIR)/rustlib/$(3)/bin
+ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
+         $$(foreach crate,$$(TARGET_CRATES), \
+           $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(crate)) \
+@@ -198,9 +190,12 @@ INSTALL_DEBUGGER_SCRIPT_COMMANDS=$(if $(findstring windows,$(1)),\
+ 
  define DEF_PREPARE
  
- prepare-base-$(1): PREPARE_SOURCE_DIR=$$(PREPARE_HOST)/stage$$(PREPARE_STAGE)
--prepare-base-$(1): PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_DIR)/bin
-+prepare-base-$(1): PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_DIR)/$$(CFG_BINDIR_RELATIVE)
- prepare-base-$(1): PREPARE_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_DIR)/$$(CFG_LIBDIR_RELATIVE)
- prepare-base-$(1): PREPARE_SOURCE_MAN_DIR=$$(S)/man
--prepare-base-$(1): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/bin
-+prepare-base-$(1): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_BINDIR_RELATIVE)
- prepare-base-$(1): PREPARE_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)
- prepare-base-$(1): PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
- prepare-base-$(1): prepare-everything-$(1)
-diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs
-index 311ab1c..1b03b1a 100644
---- a/src/librustc/metadata/filesearch.rs
-+++ b/src/librustc/metadata/filesearch.rs
-@@ -68,8 +68,7 @@ impl<'a> FileSearch<'a> {
-         if !found {
-             let rustpath = rust_path();
-             for path in &rustpath {
--                let tlib_path = make_rustpkg_lib_path(
--                    self.sysroot, path, self.triple);
-+                let tlib_path = make_rustpkg_lib_path(path, self.triple);
-                 debug!("is {} in visited_dirs? {}", tlib_path.display(),
-                         visited_dirs.contains(&tlib_path));
++prepare-base-$(1)-%: PREPARE_SOURCE_DIR=$$(PREPARE_HOST)/stage$$(PREPARE_STAGE)
++prepare-base-$(1)-%: PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_DIR)/$$(CFG_BINDIR_RELATIVE)
++prepare-base-$(1)-%: PREPARE_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_DIR)/$$(CFG_LIBDIR_RELATIVE)
+ prepare-base-$(1)-%: PREPARE_SOURCE_MAN_DIR=$$(S)/man
+-prepare-base-$(1)-%: PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/bin
+-prepare-base-$(1)-%: PREPARE_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(call PREPARE_TAR_LIB_DIR,$$(CFG_LIBDIR_RELATIVE))
++prepare-base-$(1)-%: PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_BINDIR_RELATIVE)
++prepare-base-$(1)-%: PREPARE_DEST_LIB_DIR=$$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)
+ prepare-base-$(1)-%: PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
  
-@@ -96,7 +95,7 @@ impl<'a> FileSearch<'a> {
-         where F: FnMut(&Path, PathKind) -> FileMatch
-     {
-         self.for_each_lib_search_path(|lib_search_path, kind| {
--            debug!("searching {}", lib_search_path.display());
-+            info!("searching {}", lib_search_path.display());
-             match fs::read_dir(lib_search_path) {
-                 Ok(files) => {
-                     let files = files.filter_map(|p| p.ok().map(|s| s.path()))
-@@ -157,7 +156,7 @@ impl<'a> FileSearch<'a> {
+ prepare-base-$(1)-target: prepare-target-$(1)
+diff --git a/src/librustc/session/filesearch.rs b/src/librustc/session/filesearch.rs
+index 09c6b54..00736c6 100644
+--- a/src/librustc/session/filesearch.rs
++++ b/src/librustc/session/filesearch.rs
+@@ -124,7 +124,7 @@ impl<'a> FileSearch<'a> {
      // Returns a list of directories where target-specific tool binaries are located.
      pub fn get_tools_search_paths(&self) -> Vec<PathBuf> {
          let mut p = PathBuf::from(self.sysroot);
@@ -228,7 +238,7 @@ index 311ab1c..1b03b1a 100644
          p.push(&rustlibdir());
          p.push(&self.triple);
          p.push("bin");
-@@ -165,8 +164,8 @@ impl<'a> FileSearch<'a> {
+@@ -132,8 +132,8 @@ impl<'a> FileSearch<'a> {
      }
  }
  
@@ -239,24 +249,14 @@ index 311ab1c..1b03b1a 100644
      assert!(p.is_relative());
      p.push(&rustlibdir());
      p.push(target_triple);
-@@ -176,17 +175,28 @@ pub fn relative_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf
+@@ -143,7 +143,19 @@ pub fn relative_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf
  
  fn make_target_lib_path(sysroot: &Path,
                          target_triple: &str) -> PathBuf {
 -    sysroot.join(&relative_target_lib_path(sysroot, target_triple))
 +    sysroot.join(&relative_target_lib_path(target_triple))
- }
- 
--fn make_rustpkg_lib_path(sysroot: &Path,
--                         dir: &Path,
-+fn make_rustpkg_lib_path(dir: &Path,
-                          triple: &str) -> PathBuf {
--    let mut p = dir.join(&find_libdir(sysroot));
-+    let mut p = dir.join(libdir_str());
-     p.push(triple);
-     p
- }
- 
++}
++
 +pub fn bindir_relative_str() -> &'static str {
 +    env!("CFG_BINDIR_RELATIVE")
 +}
@@ -267,12 +267,10 @@ index 311ab1c..1b03b1a 100644
 +
 +pub fn libdir_str() -> &'static str {
 +    env!("CFG_LIBDIR_RELATIVE")
-+}
-+
+ }
+ 
  pub fn get_or_default_sysroot() -> PathBuf {
-     // Follow symlinks.  If the resolved path is relative, make it absolute.
-     fn canonicalize(path: Option<PathBuf>) -> Option<PathBuf> {
-@@ -202,7 +212,18 @@ pub fn get_or_default_sysroot() -> PathBuf {
+@@ -161,44 +173,22 @@ pub fn get_or_default_sysroot() -> PathBuf {
      }
  
      match canonicalize(env::current_exe().ok()) {
@@ -292,13 +290,8 @@ index 311ab1c..1b03b1a 100644
          None => panic!("can't determine value for sysroot")
      }
  }
-@@ -257,47 +278,6 @@ pub fn rust_path() -> Vec<PathBuf> {
-     env_rust_path
- }
  
 -// The name of the directory rustc expects libraries to be located.
--// On Unix should be "lib", on windows "bin"
--#[cfg(unix)]
 -fn find_libdir(sysroot: &Path) -> String {
 -    // FIXME: This is a quick hack to make the rustc binary able to locate
 -    // Rust libraries in Linux environments where libraries might be installed
@@ -331,20 +324,14 @@ index 311ab1c..1b03b1a 100644
 -        "lib".to_string()
 -    }
 -}
--
--#[cfg(windows)]
--fn find_libdir(_sysroot: &Path) -> String {
--    "bin".to_string()
--}
--
+ 
  // The name of rustc's own place to organize libraries.
  // Used to be "rustc", now the default is "rustlib"
- pub fn rustlibdir() -> String {
 diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 5bdc76b..25dd2e6 100644
+index ec1383f..670d637 100644
 --- a/src/librustc_trans/back/link.rs
 +++ b/src/librustc_trans/back/link.rs
-@@ -1011,11 +1011,10 @@ fn link_args(cmd: &mut Linker,
+@@ -1042,11 +1042,10 @@ fn link_args(cmd: &mut Linker,
      // where extern libraries might live, based on the
      // addl_lib_search_paths
      if sess.opts.cg.rpath {
@@ -358,5 +345,5 @@ index 5bdc76b..25dd2e6 100644
              path.push(&tlib);
  
 -- 
-2.5.1
+2.4.10
 

recipes-devtools/rust/files/rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch

@@ -1,17 +1,17 @@
-From 1aebe22b98f797765293bafc1f5e8990a742b291 Mon Sep 17 00:00:00 2001
+From 8b088363a61a627fd8a31318d15164113f081660 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Wed, 3 Dec 2014 19:15:19 -0500
-Subject: [PATCH 06/10] std/thread_local: workaround for NULL __dso_handle
+Subject: [PATCH 6/9] std/thread_local: workaround for NULL __dso_handle
 
 ---
  src/libstd/thread/local.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
-index 9a6d68a..37a0ea0 100644
+index ca0f103..5851127 100644
 --- a/src/libstd/thread/local.rs
 +++ b/src/libstd/thread/local.rs
-@@ -337,7 +337,7 @@ mod imp {
+@@ -324,7 +324,7 @@ pub mod elf {
              #[linkage = "extern_weak"]
              static __cxa_thread_atexit_impl: *const libc::c_void;
          }
@@ -21,5 +21,5 @@ index 9a6d68a..37a0ea0 100644
                                        arg: *mut u8,
                                        dso_handle: *mut u8) -> libc::c_int;
 -- 
-2.5.1
+2.4.10
 

recipes-devtools/rust/files/rust/0007-mk-install-use-disable-rewrite-paths.patch

@@ -0,0 +1,30 @@
+From 1a9ada8070bb9cd293cfb93913721c68ca0b7766 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Mon, 2 Mar 2015 13:34:59 -0500
+Subject: [PATCH 7/9] mk/install: use disable-rewrite-paths
+
+This stops the install scripts from doing work we've already handled.
+
+Path rewriting is only useful for prepackaged binary installers.
+---
+ mk/install.mk | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/mk/install.mk b/mk/install.mk
+index af6f3ff..430add7 100644
+--- a/mk/install.mk
++++ b/mk/install.mk
+@@ -12,7 +12,9 @@ RUN_INSTALLER = cd tmp/empty_dir && \
+ 	sh ../../tmp/dist/$(1)/install.sh \
+ 		--prefix="$(DESTDIR)$(CFG_PREFIX)" \
+ 		--libdir="$(DESTDIR)$(CFG_LIBDIR)" \
+-		--mandir="$(DESTDIR)$(CFG_MANDIR)"
++		--mandir="$(DESTDIR)$(CFG_MANDIR)" \
++		"$(MAYBE_DISABLE_VERIFY)" \
++		--disable-rewrite-paths
+ 
+ install:
+ ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
+-- 
+2.4.10
+

recipes-devtools/rust/files/rust/0009-Remove-crate-metadata-from-symbol-hashing.patch

@@ -1,17 +1,17 @@
-From ffacbea82a7e03fadc05d31313e2bbd3e10388fb Mon Sep 17 00:00:00 2001
+From 8e359ae2b44fe2edd863e460346554c73f460ba7 Mon Sep 17 00:00:00 2001
 From: Steven Walter <swalter@lexmark.com>
 Date: Tue, 7 Jul 2015 14:57:42 -0400
-Subject: [PATCH 09/10] Remove crate metadata from symbol hashing
+Subject: [PATCH 9/9] Remove crate metadata from symbol hashing
 
 ---
  src/librustc_trans/back/link.rs | 5 -----
  1 file changed, 5 deletions(-)
 
 diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 25dd2e6..d203d07 100644
+index 670d637..4e7150e 100644
 --- a/src/librustc_trans/back/link.rs
 +++ b/src/librustc_trans/back/link.rs
-@@ -206,11 +206,6 @@ fn symbol_hash<'tcx>(tcx: &ty::ctxt<'tcx>,
+@@ -213,11 +213,6 @@ fn symbol_hash<'tcx>(tcx: &ty::ctxt<'tcx>,
      symbol_hasher.reset();
      symbol_hasher.input_str(&link_meta.crate_name);
      symbol_hasher.input_str("-");
@@ -20,9 +20,9 @@ index 25dd2e6..d203d07 100644
 -        symbol_hasher.input_str(&meta[..]);
 -    }
 -    symbol_hasher.input_str("-");
-     symbol_hasher.input_str(&encoder::encoded_ty(tcx, t));
+     symbol_hasher.input(&tcx.sess.cstore.encode_type(tcx, t));
      // Prefix with 'h' so that it never blends into adjacent digits
      let mut hash = String::from("h");
 -- 
-2.5.1
+2.4.10
 

recipes-devtools/rust/files/rust/0010-rustc_trans-make-.note.rustc-look-more-like-debug-in.patch

@@ -0,0 +1,156 @@
+From 04eee951641b9d9c580ee21c481bdf979dc2fe30 Mon Sep 17 00:00:00 2001
+From: Steven Walter <swalter@lexmark.com>
+Date: Tue, 7 Jul 2015 16:49:44 -0400
+Subject: [PATCH 10/12] rustc_trans: make .note.rustc look more like debug info
+
+Mark the global variable as const and private so the resulting section
+is not flagged as writable and to avoid putting an unnecessary symbol in
+the dynamic table of shared objects.
+
+Unfortunately there doesn't seem to be a way to avoid the section being
+marked SHF_ALLOC when declared as a variable in LLVM. Hack around that
+by using objcopy to clear the flags on the section before the final
+link.
+
+This places the section at the end of the executable so it can be
+stripped later without rearranging important code/data sections.
+---
+ mk/platform.mk                   |  1 +
+ src/librustc/session/config.rs   |  2 ++
+ src/librustc_back/target/mod.rs  |  4 ++++
+ src/librustc_trans/back/link.rs  | 36 ++++++++++++++++++++++++++++++++++++
+ src/librustc_trans/trans/base.rs |  3 +++
+ 5 files changed, 46 insertions(+)
+
+diff --git a/mk/platform.mk b/mk/platform.mk
+index 5239086..eb693b8 100644
+--- a/mk/platform.mk
++++ b/mk/platform.mk
+@@ -186,6 +186,7 @@ define CFG_MAKE_TOOLCHAIN
+        AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
+        LINK_$(1)=$(CROSS_PREFIX_$(1))$(LINK_$(1))
+        RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(LINK_$(1))) \
++           -C objcopy=$$(call FIND_COMPILER,$$(OBJCOPY_$(1))) \
+            -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
+ 
+        RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
+diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
+index 4cc059b..600cb4b 100644
+--- a/src/librustc/session/config.rs
++++ b/src/librustc/session/config.rs
+@@ -497,6 +497,8 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
+          CG_OPTIONS, cg_type_desc, cgsetters,
+     ar: Option<String> = (None, parse_opt_string,
+         "tool to assemble archives with"),
++    objcopy: Option<String> = (None, parse_opt_string,
++        "system objcopy for manipulating objects"),
+     linker: Option<String> = (None, parse_opt_string,
+         "system linker to link outputs with"),
+     link_args: Option<Vec<String>> = (None, parse_opt_list,
+diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
+index 636a1aa..1b87a7a 100644
+--- a/src/librustc_back/target/mod.rs
++++ b/src/librustc_back/target/mod.rs
+@@ -118,6 +118,8 @@ pub struct TargetOptions {
+     /// Linker arguments that are unconditionally passed *after* any
+     /// user-defined libraries.
+     pub post_link_args: Vec<String>,
++    /// Path to objcopy.  Defaults to "objcopy".
++    pub objcopy: String,
+ 
+     /// Default CPU to pass to LLVM. Corresponds to `llc -mcpu=$cpu`. Defaults
+     /// to "default".
+@@ -213,6 +215,7 @@ impl Default for TargetOptions {
+             ar: option_env!("CFG_DEFAULT_AR").unwrap_or("ar").to_string(),
+             pre_link_args: Vec::new(),
+             post_link_args: Vec::new(),
++            objcopy: "objcopy".to_string(),
+             cpu: "generic".to_string(),
+             features: "".to_string(),
+             dynamic_linking: false,
+@@ -331,6 +334,7 @@ impl Target {
+         key!(cpu);
+         key!(ar);
+         key!(linker);
++        key!(objcopy);
+         key!(relocation_model);
+         key!(code_model);
+         key!(dll_prefix);
+diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
+index 4e7150e..0d8a125 100644
+--- a/src/librustc_trans/back/link.rs
++++ b/src/librustc_trans/back/link.rs
+@@ -394,6 +394,13 @@ fn command_path(sess: &Session) -> OsString {
+     env::join_paths(new_path).unwrap()
+ }
+ 
++pub fn get_objcopy_prog(sess: &Session) -> String {
++    match sess.opts.cg.objcopy {
++        Some(ref objcopy) => return objcopy.to_string(),
++        None => sess.target.target.options.objcopy.clone(),
++    }
++}
++
+ pub fn remove(sess: &Session, path: &Path) {
+     match fs::remove_file(path) {
+         Ok(..) => {}
+@@ -928,6 +935,32 @@ fn link_natively(sess: &Session, dylib: bool,
+     }
+ }
+ 
++fn fix_meta_section_attributes(sess: &Session, meta_name: &PathBuf) {
++    // First, fix up the note section attributes.  We want the SHF_ALLOC and
++    // SHF_WRITE flags to be unset so the section will get placed near the
++    // end along with the debug info.  This allows the section to be
++    // stripped later without renumbering important sections that
++    // contain code and data.
++    let objcopy = get_objcopy_prog(sess);
++    let mut o_cmd = Command::new(&objcopy);
++    o_cmd.arg("--rename-section")
++         .arg(".note.rustc=.note.rustc,contents,noload,readonly")
++         .arg(&meta_name);
++    // Invoke objcopy
++    info!("{:?}", o_cmd);
++    match o_cmd.status() {
++        Ok(exitstatus) => {
++            if !exitstatus.success() {
++                sess.err(&format!("objcopy failed with exit code {:?}", exitstatus.code()));
++            }
++        },
++        Err(exitstatus) => {
++            sess.err(&format!("objcopy failed: {}", exitstatus));
++        }
++    }
++    sess.abort_if_errors();
++}
++
+ fn link_args(cmd: &mut Linker,
+              sess: &Session,
+              dylib: bool,
+@@ -960,6 +993,9 @@ fn link_args(cmd: &mut Linker,
+     // executable. This metadata is in a separate object file from the main
+     // object file, so we link that in here.
+     if dylib {
++        let meta_name = outputs.with_extension("metadata.o");
++
++        fix_meta_section_attributes(sess, &meta_name);
+         cmd.add_object(&outputs.with_extension("metadata.o"));
+     }
+ 
+diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs
+index 4c619f8..2b68767 100644
+--- a/src/librustc_trans/trans/base.rs
++++ b/src/librustc_trans/trans/base.rs
+@@ -2924,6 +2924,9 @@ pub fn write_metadata<'a, 'tcx>(cx: &SharedCrateContext<'a, 'tcx>,
+     };
+     unsafe {
+         llvm::LLVMSetInitializer(llglobal, llconst);
++        llvm::LLVMSetGlobalConstant(llglobal, llvm::True);
++        llvm::LLVMSetUnnamedAddr(llglobal, llvm::True);
++        llvm::SetLinkage(llglobal, llvm::Linkage::PrivateLinkage);
+         let name =
+             cx.tcx().sess.cstore.metadata_section_name(&cx.sess().target.target);
+         let name = CString::new(name).unwrap();
+-- 
+1.9.1
+

recipes-devtools/rust/files/rust/0011-Allow-overriding-crate_hash-with-C-crate_hash.patch

@@ -0,0 +1,80 @@
+From b6805ab1099ca824bb516da4f1825a7e4ce30153 Mon Sep 17 00:00:00 2001
+From: Steven Walter <swalter@lexmark.com>
+Date: Wed, 18 Nov 2015 08:33:26 -0500
+Subject: [PATCH 11/12] Allow overriding crate_hash with -C crate_hash
+
+The current crate hash is not stable from run-to-run.  This causes
+problems with bitbake; it needs a guarantee that every build with the
+same input will generate compatible output, otherwise sstate won't work.
+Using -C crate_hash, we can do that by using the bitbake input hash to
+determine the crate hash; the bitbake input hash will be stable, but
+still different for different rust recipes.
+---
+ src/librustc/session/config.rs  |  2 ++
+ src/librustc_trans/back/link.rs | 28 ++++++++++++++++++++++++++--
+ 2 files changed, 28 insertions(+), 2 deletions(-)
+
+diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
+index 600cb4b..3570e78 100644
+--- a/src/librustc/session/config.rs
++++ b/src/librustc/session/config.rs
+@@ -537,6 +537,8 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
+          "choose the code model to use (llc -code-model for details)"),
+     metadata: Vec<String> = (Vec::new(), parse_list,
+          "metadata to mangle symbol names with"),
++    crate_hash: String = ("".to_string(), parse_string,
++         "override crate hash with given value"),
+     extra_filename: String = ("".to_string(), parse_string,
+          "extra data to put in each output filename"),
+     codegen_units: usize = (1, parse_uint,
+diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
+index 0d8a125..9917a1e 100644
+--- a/src/librustc_trans/back/link.rs
++++ b/src/librustc_trans/back/link.rs
+@@ -45,7 +45,7 @@ use std::str;
+ use flate;
+ use serialize::hex::ToHex;
+ use syntax::ast;
+-use syntax::codemap::Span;
++use syntax::codemap::{Span,BytePos,NO_EXPANSION};
+ use syntax::parse::token::{self, InternedString};
+ use syntax::attr::AttrMetaMethods;
+ 
+@@ -186,9 +186,33 @@ pub fn build_link_meta(sess: &Session,
+                        krate: &hir::Crate,
+                        name: &str)
+                        -> LinkMeta {
++    use std::collections::BTreeMap;
++    let crate_hash = if sess.opts.cg.crate_hash != "" {
++        let dummy_span = Span {
++            lo: BytePos(0),
++            hi: BytePos(0),
++            expn_id: NO_EXPANSION
++        };
++        let dummy_module = hir::Mod {
++            inner: dummy_span,
++            item_ids: hir::HirVec::new()
++        };
++        let dummy_krate = hir::Crate {
++            module: dummy_module,
++            attrs: hir::HirVec::new(),
++            config: hir::CrateConfig::new(),
++            span: dummy_span,
++            exported_macros: hir::HirVec::new(),
++            items: BTreeMap::new()
++        };
++
++        Svh::calculate(&vec!(sess.opts.cg.crate_hash.clone()), &dummy_krate)
++    } else {
++        Svh::calculate(&sess.opts.cg.metadata, krate)
++    };
+     let r = LinkMeta {
+         crate_name: name.to_owned(),
+-        crate_hash: Svh::calculate(&sess.opts.cg.metadata, krate),
++        crate_hash: crate_hash,
+     };
+     info!("{:?}", r);
+     return r;
+-- 
+1.9.1
+

recipes-devtools/rust/files/rust/0012-mk-platform.mk-pass-C-crate_hash-to-builds.patch

@@ -0,0 +1,25 @@
+From 7abedc46cad6b52d44badaf88350d41ef907cd4c Mon Sep 17 00:00:00 2001
+From: Steven Walter <swalter@lexmark.com>
+Date: Wed, 18 Nov 2015 08:41:17 -0500
+Subject: [PATCH 12/12] mk/platform.mk: pass -C crate_hash to builds
+
+bitbake recipe will export FORCE_CRATE_HASH
+---
+ mk/platform.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mk/platform.mk b/mk/platform.mk
+index eb693b8..e6317b5 100644
+--- a/mk/platform.mk
++++ b/mk/platform.mk
+@@ -187,6 +187,7 @@ define CFG_MAKE_TOOLCHAIN
+        LINK_$(1)=$(CROSS_PREFIX_$(1))$(LINK_$(1))
+        RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(LINK_$(1))) \
+            -C objcopy=$$(call FIND_COMPILER,$$(OBJCOPY_$(1))) \
++           -C crate_hash=$(FORCE_CRATE_HASH) \
+            -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
+ 
+        RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
+-- 
+1.9.1
+

recipes-devtools/rust/files/rust/0013-mk-allow-changing-the-platform-configuration-source-.patch

@@ -0,0 +1,56 @@
+From f3e8bd9ab353d4b3d7432a02e37a22eed24b5e57 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Thu, 4 Feb 2016 10:44:23 -0500
+Subject: [PATCH] mk: allow changing the platform configuration source
+ directory
+
+---
+ configure      | 4 +++-
+ mk/platform.mk | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 7d53a66..5d40516 100755
+--- a/configure
++++ b/configure
+@@ -671,6 +671,7 @@ valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary"
+ valopt_nosave host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples"
+ valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
+ valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
++valopt_nosave platform-cfg "${CFG_SRC_DIR}/mk/cfg" "Location platform configuration for non-rust code"
+ 
+ # Temporarily support old triples until buildbots get updated
+ CFG_BUILD=$(to_llvm_triple $CFG_BUILD)
+@@ -1127,7 +1128,7 @@ CFG_MANDIR=${CFG_MANDIR%/}
+ CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
+ CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
+ CFG_SUPPORTED_TARGET=""
+-for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
++for target_file in ${CFG_PLATFORM_CFG}/*.mk; do
+   CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
+ done
+ 
+@@ -1795,6 +1796,7 @@ putvar CFG_I686_LINUX_ANDROID_NDK
+ putvar CFG_NACL_CROSS_PATH
+ putvar CFG_MANDIR
+ putvar CFG_USING_LIBCPP
++putvar CFG_PLATFORM_CFG
+ 
+ # Avoid spurious warnings from clang by feeding it original source on
+ # ccache-miss rather than preprocessed input.
+diff --git a/mk/platform.mk b/mk/platform.mk
+index e6317b5..68a20e1 100644
+--- a/mk/platform.mk
++++ b/mk/platform.mk
+@@ -114,7 +114,7 @@ $(foreach cvar,CC CXX CPP CFLAGS CXXFLAGS CPPFLAGS, \
+ 
+ CFG_RLIB_GLOB=lib$(1)-*.rlib
+ 
+-include $(wildcard $(CFG_SRC_DIR)mk/cfg/*.mk)
++include $(wildcard $(CFG_PLATFORM_CFG)/*.mk)
+ 
+ define ADD_INSTALLED_OBJECTS
+   INSTALLED_OBJECTS_$(1) += $$(CFG_INSTALLED_OBJECTS_$(1))
+-- 
+2.7.0
+

recipes-devtools/rust/files/rust/fix-urandom-during-init.patch

@@ -0,0 +1,28 @@
+diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs
+index 92c3bf8..b9fd014 100644
+--- a/src/libstd/rand/os.rs
++++ b/src/libstd/rand/os.rs
+@@ -46,8 +46,10 @@
+         #[cfg(target_arch = "aarch64")]
+         const NR_GETRANDOM: libc::c_long = 278;
+ 
++        const GRND_NONBLOCK: libc::c_uint = 0x0001;
++
+         unsafe {
+-            libc::syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), 0)
++            libc::syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), GRND_NONBLOCK)
+         }
+     }
+ 
+@@ -69,6 +71,10 @@
+                 let err = errno() as libc::c_int;
+                 if err == libc::EINTR {
+                     continue;
++                } else if err == libc::EAGAIN {
++                    let mut reader_rng = ReaderRng::new(File::open("/dev/urandom").unwrap());
++                    reader_rng.fill_bytes(&mut v[read..]);
++                    read += v.len() as usize; 
+                 } else {
+                     panic!("unexpected getrandom error: {}", err);
+                 }
+

recipes-devtools/rust/rust-1.3.0.inc

@@ -1,15 +0,0 @@
-SRC_URI[rust.md5sum] = "ffb3971cc96eccaf2de202f621fd415f"
-SRC_URI[rust.sha256sum] = "ea02d7bc9e7de5b8be3fe6b37ea9b2bd823f9a532c8e4c47d02f37f24ffa3126"
-
-## snapshot info taken from rust/src/snapshots.txt
-## TODO: find a way to add aditional SRC_URIs based on the contents of an
-##       earlier SRC_URI.
-RS_DATE = "2015-07-26"
-RS_SRCHASH = "a5c12f4"
-# linux-x86_64
-RS_ARCH = "linux-x86_64"
-RS_HASH = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c"
-RUST_SNAPSHOT = "rust-stage0-${RS_DATE}-${RS_SRCHASH}-${RS_ARCH}-${RS_HASH}.tar.bz2"
-
-SRC_URI[rust-snapshot.md5sum] = "8f804ec5cebf370c59563a2b35a808cb"
-SRC_URI[rust-snapshot.sha256sum] = "779943595dd63d6869c747e2a31c13095f9c5354d4530327d6f9310cc580c2ff"

recipes-devtools/rust/rust-cross.bb

@@ -0,0 +1,44 @@
+require rust.inc
+inherit cross
+
+# 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"
+
+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}"
+
+# cross.bbclass is "helpful" and overrides our do_install. Tell it not to.
+do_install () {
+	rust_do_install
+}
+
+# using host-strip on target .so files generated by this recipie causes build errors.
+# for now, disable stripping.
+# A better (but more complex) approach would be to mimic gcc-runtime and build
+# the target.so files in a seperate .bb file.
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"

recipes-devtools/rust/rust-git.inc

@@ -1,7 +0,0 @@
-SRC_URI = "\
-	gitsm://github.com/rust-lang/rust.git;protocol=https \
-"
-S = "${WORKDIR}/git"
-PV .= "+git${SRCPV}"
-require rust.inc
-

recipes-devtools/rust/rust-llvm.bb

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

recipes-devtools/rust/rust-llvm.inc

@@ -1,8 +1,9 @@
+require rust-shared-source.inc
 
 SUMMARY = "LLVM compiler framework (packaged with rust)"
 LICENSE = "NCSA"
 
-S = "${WORKDIR}/rustc-${PV}/src/llvm"
+S .= "/src/llvm"
 
 inherit autotools
 
@@ -11,14 +12,26 @@ EXTRA_OECONF += "--enable-optimized"
 EXTRA_OECONF += "--disable-assertions"
 EXTRA_OECONF += "--disable-docs"
 EXTRA_OECONF += "--enable-bindings=none"
+EXTRA_OECONF += "--disable-terminfo"
+EXTRA_OECONF += "--disable-zlib"
+EXTRA_OECONF += "--disable-libffi"
 EXTRA_OECONF += "--enable-keep-symbols"
 
+PACKAGES += "${PN}-data"
+
+# Add the extra locations to avoid the complaints about unpackaged files
+FILES_${PN}-data = "${datadir}"
+FILES_${PN}-dev += "${libdir}"
+
 do_install_append () {
-	cd ${D}${bindir}
+	# Remove the debug info (>2 GB) as part of normal operation
+	rm -rf ${D}${bindir}/.debug
+
+	cd ${D}${bindir} || bbfatal "failed to cd ${D}${bindir}"
 	ln -s *-llc llc
-	for i in *-llvm-*; do
-		link=$(echo $i | sed -e 's/.*-llvm-\(.*\)/\1/')
-		ln -s $i llvm-$link
+	for i in *-llvm-* *-llc *-lli *-FileCheck; do
+		link=$(echo $i | sed -e "s/${TARGET_SYS}-\(.*\)/\1/")
+		ln -sf "$i" "${link}" || bbfatal "failed to symlink ${link}"
 	done
 }
 

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

@@ -0,0 +1,3 @@
+inherit shared-source-use
+require rust-version.inc
+S .= "/rustc-${PV}"

recipes-devtools/rust/rust-snapshot-2015-12-18.inc

@@ -0,0 +1,14 @@
+## snapshot info taken from rust/src/snapshots.txt
+## TODO: find a way to add additional SRC_URIs based on the contents of an
+##       earlier SRC_URI.
+RS_DATE = "2015-12-18"
+RS_SRCHASH = "3391630"
+# linux-x86_64
+RS_ARCH = "linux-x86_64"
+RS_HASH = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4"
+
+RUST_SNAPSHOT = "rust-stage0-${RS_DATE}-${RS_SRCHASH}-${RS_ARCH}-${RS_HASH}.tar.bz2"
+
+SRC_URI[rust-snapshot.md5sum] = "5c29eb06c8b6ce6ff52f544f31efabe1"
+SRC_URI[rust-snapshot.sha256sum] = "a8dc5203673ce43f47316beb02ee0c427edb7bbde2ab5fc662a06b52db2950e7"
+

recipes-devtools/rust/rust-source.bb

@@ -0,0 +1,30 @@
+# In order to share the same source between multiple packages (.bb files), we
+# unpack and patch the rustc source here into a shared dir.
+#
+# Take a look at gcc-source.inc for the general structure of this
+
+inherit shared-source-provide
+
+require rust-version.inc
+require rust-release.inc
+
+SRC_URI[rust.md5sum] = "15f1c204580017838301c5c8568e8f3f"
+SRC_URI[rust.sha256sum] = "6df96059d87b718676d9cd879672e4e22418b6093396b4ccb5b5b66df37bf13a"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=eb87dba71cb424233bcce88db3ae2f1a"
+
+SRC_URI_append = "\
+        file://rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \
+        file://rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \
+        file://rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \
+        file://rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch \
+        file://rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch \
+        file://rust/0007-mk-install-use-disable-rewrite-paths.patch \
+        file://rust/0009-Remove-crate-metadata-from-symbol-hashing.patch \
+        file://rust/0010-rustc_trans-make-.note.rustc-look-more-like-debug-in.patch \
+        file://rust/0011-Allow-overriding-crate_hash-with-C-crate_hash.patch \
+        file://rust/0012-mk-platform.mk-pass-C-crate_hash-to-builds.patch \
+        file://rust/0013-mk-allow-changing-the-platform-configuration-source-.patch \
+        file://rust-llvm/0000-rust-llvm-remove-extra-slash.patch \
+        file://rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \
+        file://rust/fix-urandom-during-init.patch \
+"

recipes-devtools/rust/rust-version.inc

@@ -0,0 +1,6 @@
+# Note: if you adjust this, you'll also need to change the hashes in
+# rust-source.bb
+SOURCE_NAME = "rust"
+PV = "1.7.0"
+
+LICENSE = "MIT | Apache-2.0"

recipes-devtools/rust/rust.bb

@@ -0,0 +1,10 @@
+require rust.inc
+
+DEPENDS += "rust-llvm"
+
+# 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.inc

@@ -1,20 +1,22 @@
+# ex: sts=4 et sw=4 ts=8
 inherit rust
 inherit rust-installer
+require rust-shared-source.inc
+require rust-snapshot-2015-12-18.inc
+
+LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=9c5a05eab0ffc3590e50db38c51d1425"
 
 SUMMARY = "Rust compiler and runtime libaries"
 HOMEPAGE = "http://www.rust-lang.org"
 SECTION = "devel"
-LICENSE = "MIT | Apache-2.0"
 
 B = "${WORKDIR}/build"
 
-DEPENDS += "rust-llvm"
+DEPENDS += "file-native"
 
 # Avoid having the default bitbake.conf disable sub-make parallelization
 EXTRA_OEMAKE = ""
 
-LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=b1ab5514343f97198b323e33779470a3"
-
 PACKAGECONFIG ??= ""
 
 # Controls whether we use the local rust to build.
@@ -28,41 +30,136 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'local-rust', '', 'https://sta
 # We generate local targets, and need to be able to locate them
 export RUST_TARGET_PATH="${WORKDIR}/targets/"
 
+export FORCE_CRATE_HASH="${BB_TASKHASH}"
+
+# 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', True)
+    if not feat:
+        return ""
+    feat = frozenset(feat.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")
+
+    v7=frozenset(['armv7a', 'armv7r', 'armv7m', 'armv7ve'])
+    if not feat.isdisjoint(v7):
+        f.append("+v7")
+    if 'armv6' in feat:
+        f.append("+v6")
+
+    if 'dsp' in feat:
+        f.append("+dsp")
+
+    if d.getVar('ARM_THUMB_OPT', True) is "thumb":
+        if 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")
+
+    # Seems like it could be infered by the lack of vfp options, but we'll
+    # include it anyhow
+    if 'soft' in feat:
+        f.append("+soft-float")
+
+    return ','.join(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', True)
+    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 ','.join(f)
+
 ## arm-unknown-linux-gnueabihf
-DATA_LAYOUT[arm] = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32"
 LLVM_TARGET[arm] = "${RUST_TARGET_SYS}"
 TARGET_ENDIAN[arm] = "little"
 TARGET_POINTER_WIDTH[arm] = "32"
 FEATURES[arm] = "+v6,+vfp2"
 PRE_LINK_ARGS[arm] = "-Wl,--as-needed"
+POST_LINK_ARGS[arm] = "-lssp"
+
+## aarch64-unknown-linux-gnu
+LLVM_TARGET[aarch64] = "aarch64-unknown-linux-gnu"
+TARGET_ENDIAN[aarch64] = "little"
+TARGET_POINTER_WIDTH[aarch64] = "64"
+PRE_LINK_ARGS[aarch64] = "-Wl,--as-needed"
 
 ## x86_64-unknown-linux-gnu
-DATA_LAYOUT[x86_64] = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 LLVM_TARGET[x86_64] = "x86_64-unknown-linux-gnu"
 TARGET_ENDIAN[x86_64] = "little"
 TARGET_POINTER_WIDTH[x86_64] = "64"
 PRE_LINK_ARGS[x86_64] = "-Wl,--as-needed -m64"
 
 ## i686-unknown-linux-gnu
-DATA_LAYOUT[i686] = "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32"
 LLVM_TARGET[i686] = "i686-unknown-linux-gnu"
 TARGET_ENDIAN[i686] = "little"
 TARGET_POINTER_WIDTH[i686] = "32"
 PRE_LINK_ARGS[i686] = "-Wl,--as-needed -m32"
 
 ## XXX: a bit of a hack so qemux86 builds, clone of i686-unknown-linux-gnu above
-DATA_LAYOUT[i586] = "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32"
 LLVM_TARGET[i586] = "i586-unknown-linux-gnu"
 TARGET_ENDIAN[i586] = "little"
 TARGET_POINTER_WIDTH[i586] = "32"
 PRE_LINK_ARGS[i586] = "-Wl,--as-needed -m32"
 
-# enable-new-dtags causes rpaths to be inserted as DT_RUNPATH (as well as
-# DT_RPATH), which lets LD_LIBRARY_PATH override them
-RPATH_LDFLAGS = "-Wl,--enable-new-dtags"
-TARGET_PRE_LINK_ARGS = "${RPATH_LDFLAGS} ${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
-BUILD_PRE_LINK_ARGS = "${RPATH_LDFLAGS} ${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
-HOST_PRE_LINK_ARGS = "${RPATH_LDFLAGS} ${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
+TARGET_PRE_LINK_ARGS = "${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
+BUILD_PRE_LINK_ARGS = "${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
+HOST_PRE_LINK_ARGS = "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
 
 # These LDFLAGS have '-L' options in them. We need these to come last so they
 # don't screw up the link order and pull in the wrong rust build/version.
@@ -103,17 +200,22 @@ def arch_to_rust_target_arch(arch):
     else:
         return arch
 
-def as_json(list_):
-    a = '['
-    for e in list_:
-        if type(e) == str:
-            a += '"{}",'.format(e)
-        else:
-            raise Exception
-    if len(list_):
-        a = a[:-1]
-    a += ']'
-    return a
+# generates our target CPU value
+def llvm_cpu(d):
+    cpu = d.getVar('TUNE_PKGARCH', True)
+    target = d.getVar('TRANSLATED_TARGET_ARCH', True)
+
+    trans = {}
+    trans['corei7-64'] = "corei7"
+    trans['core2-32'] = "core2"
+    trans['x86-64'] = "x86-64"
+    trans['i686'] = "i686"
+    trans['i586'] = "i586"
+
+    try:
+        return trans[cpu]
+    except:
+        return trans.get(target, "generic")
 
 def post_link_args_for(d, thing, arch):
     post_link_args = (d.getVar('{}_POST_LINK_ARGS'.format(thing), True) or "").split()
@@ -130,70 +232,69 @@ def ldflags_for(d, thing, arch):
     a.extend(post_link_args_for(d, thing, arch))
     return a
 
+TARGET_LLVM_CPU="${@llvm_cpu(d)}"
+TARGET_LLVM_FEATURES = "${@llvm_features_from_tune(d)} ${@llvm_features_from_cc_arch(d)}"
+TARGET_LLVM_CPU_class-cross="${@llvm_cpu(d)}"
+TARGET_LLVM_FEATURES_class-cross  = "${@llvm_features_from_tune(d)} ${@llvm_features_from_cc_arch(d)}"
+
+# class-native implies TARGET=HOST, and TUNE_FEATURES only describes the real
+# (original) target.
+TARGET_LLVM_CPU="${@llvm_cpu(d)}"
+TARGET_LLVM_FEATURES_class-native = "${@llvm_features_from_cc_arch(d)}"
+
 def rust_gen_target(d, thing, wd):
+    import json
     arch = arch_for(d, thing)
     sys = sys_for(d, thing)
     prefix = prefix_for(d, thing)
-    o = open(wd + sys + '.json', 'w')
 
-    data_layout = d.getVarFlag('DATA_LAYOUT', arch, True)
-    if not data_layout:
-        bb.utils.fatal("DATA_LAYOUT[{}] required but not set for {}".format(arch, thing))
-    llvm_target = d.getVarFlag('LLVM_TARGET', arch, True)
-    target_pointer_width = d.getVarFlag('TARGET_POINTER_WIDTH', arch, True)
-    endian = d.getVarFlag('TARGET_ENDIAN', arch, True)
-    prefix = d.getVar('{}_PREFIX'.format(thing), True)
-    ccache = d.getVar('CCACHE', True)
-    linker = "{}{}gcc".format(ccache, prefix)
-    features = d.getVarFlag('FEATURES', arch, True) or ""
+    features = ""
+    if thing is "TARGET":
+        features = d.getVar('TARGET_LLVM_FEATURES', True) or ""
+    features = features or d.getVarFlag('FEATURES', arch, True) or ""
+    features = features.strip()
 
-    pre_link_args = pre_link_args_for(d, thing, arch)
-    post_link_args = post_link_args_for(d, thing, arch)
+    # build tspec
+    tspec = {}
+    tspec['llvm-target'] = d.getVarFlag('LLVM_TARGET', arch, True)
+    tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch, True)
+    tspec['target-word-size'] = tspec['target-pointer-width']
+    tspec['target-endian'] = d.getVarFlag('TARGET_ENDIAN', arch, True)
+    tspec['arch'] = arch_to_rust_target_arch(arch)
+    tspec['os'] = "linux"
+    tspec['env'] = "gnu"
+    tspec['linker'] = "{}{}gcc".format(d.getVar('CCACHE', True), prefix)
+    tspec['objcopy'] = "{}objcopy".format(prefix)
+    tspec['ar'] = "{}ar".format(prefix)
+    tspec['cpu'] = d.getVar('TARGET_LLVM_CPU', True)
+    if features is not "":
+        tspec['features'] = features
+    tspec['dynamic-linking'] = True
+    tspec['executables'] = True
+    tspec['morestack'] = True
+    tspec['linker-is-gnu'] = True
+    tspec['has-rpath'] = True
+    tspec['has-elf-tls'] = True
+    tspec['position-independent-executables'] = True
+    tspec['pre-link-args'] = pre_link_args_for(d, thing, arch)
+    tspec['post-link-args'] = post_link_args_for(d, thing, arch)
+
+    # write out the target spec json file
+    with open(wd + sys + '.json', 'w') as f:
+        json.dump(tspec, f)
 
-    o.write('''{{
-         "data-layout": "{}",
-         "llvm-target": "{}",
-         "target-endian": "{}",
-         "target-word-size": "{}",
-         "target-pointer-width": "{}",
-         "arch": "{}",
-         "os": "linux",
-         "linker": "{}",
-         "features": "{}",
-         "dynamic-linking": true,
-         "executables": true,
-         "morestack": true,
-         "linker-is-gnu": true,
-         "has-rpath": true,
-         "position-independent-executables": true,
-         "pre-link-args": {},
-         "post-link-args": {}
-    }}'''.format(
-        data_layout,
-        llvm_target,
-        endian,
-        target_pointer_width,
-        target_pointer_width,
-        arch_to_rust_target_arch(arch),
-        linker,
-        features,
-        as_json(pre_link_args),
-        as_json(post_link_args),
-    ))
-    o.close()
 
 python do_rust_gen_targets () {
     wd = d.getVar('WORKDIR', True) + '/targets/'
-    try:
-        os.makedirs(wd)
-    except OSError as e:
-        if e.errno != 17:
-            raise e
+    # It is important 'TARGET' is last here so that it overrides our less
+    # informed choices for BUILD & HOST if TARGET happens to be the same as
+    # either of them.
     for thing in ['BUILD', 'HOST', 'TARGET']:
         bb.debug(1, "rust_gen_target for " + thing)
         rust_gen_target(d, thing, wd)
 }
 addtask rust_gen_targets after do_patch before do_compile
+do_rust_gen_targets[dirs] += "${WORKDIR}/targets"
 
 def rust_gen_mk_cfg(d, thing):
     ''''
@@ -207,8 +308,8 @@ def rust_gen_mk_cfg(d, thing):
     Note that the configure process also depends on the existence of #1, so we
     have to run this before do_configure
     '''
+    import subprocess
 
-    import shutil, subprocess
     rust_base_sys = rust_base_triple(d, thing)
     arch = arch_for(d, thing)
     sys = sys_for(d, thing)
@@ -216,10 +317,9 @@ def rust_gen_mk_cfg(d, thing):
     llvm_target = d.getVarFlag('LLVM_TARGET', arch, True)
     ldflags = ' '.join(ldflags_for(d, thing, arch))
 
-    p = d.getVar('S', True) + '/mk/cfg/'
-
-    o = open(p + sys_for(d, thing) + '.mk', 'w')
-    i = open(p + rust_base_sys + '.mk', 'r')
+    b = d.getVar('WORKDIR', True) + '/mk-cfg/'
+    o = open(b + sys_for(d, thing) + '.mk', 'w')
+    i = open(d.getVar('S', True) + '/mk/cfg/' + rust_base_sys + '.mk', 'r')
 
     r = subprocess.call(['sed',
         # update all triplets to the new one
@@ -251,6 +351,9 @@ def rust_gen_mk_cfg(d, thing):
         ], stdout=o, stdin=i)
     if r:
         raise Exception
+    o.write("OBJCOPY_{} := {}objcopy\n".format(sys, prefix))
+    o.close()
+    i.close()
 
 python do_rust_arch_fixup () {
     for thing in ['BUILD', 'HOST', 'TARGET']:
@@ -258,160 +361,122 @@ python do_rust_arch_fixup () {
         rust_gen_mk_cfg(d, thing)
 }
 addtask rust_arch_fixup before do_configure after do_patch
-do_rust_arch_fixup[dirs] = "${S}/mk/cfg"
+do_rust_arch_fixup[dirs] += "${WORKDIR}/mk-cfg"
 
 llvmdir = "${STAGING_DIR_NATIVE}/${prefix_native}"
 
+# prevent the rust-installer scripts from calling ldconfig
+export CFG_DISABLE_LDCONFIG="notempty"
+
 do_configure () {
-	# FIXME: target_prefix vs prefix, see cross.bbclass
+    # Note: when we adjust the generated targets, rust doesn't rebuild (even
+    # when it should), so for now we need to remove the build dir to keep
+    # things in sync.
+    cd "${WORKDIR}"
+    rm -rf "${B}/"
+    mkdir -p "${B}/"
+    cd "${B}"
 
-	# CFLAGS, LDFLAGS, CXXFLAGS, CPPFLAGS are used by rust's build for a
-	# wide range of targets (not just HOST). Yocto's settings for them will
-	# be inappropriate, avoid using.
-	unset CFLAGS
-	unset LDFLAGS
-	unset CXXFLAGS
-	unset CPPFLAGS
+    # FIXME: target_prefix vs prefix, see cross.bbclass
 
-	# FIXME: this path to rustc (via `which rustc`) may not be quite right in the case
-	# where we're reinstalling the compiler. May want to try for a real
-	# path based on bitbake vars
-        # Also will be wrong when relative libdir and/or bindir aren't 'bin' and 'lib'.
-        local_maybe_enable=disable
-        local_rust_root=/not/set/do/not/use
-        if which rustc >/dev/null 2>&1; then
-            local_rustc=$(which rustc)
-            if [ -n "$local_rustc" ]; then
-                local_rust_root=$(dirname $(dirname $local_rustc))
-                if [ -e "$local_rust_root/bin/rustc" ]; then
-                    local_maybe_enable=enable
-                fi
+    # CFLAGS, LDFLAGS, CXXFLAGS, CPPFLAGS are used by rust's build for a
+    # wide range of targets (not just HOST). Yocto's settings for them will
+    # be inappropriate, avoid using.
+    unset CFLAGS
+    unset LDFLAGS
+    unset CXXFLAGS
+    unset CPPFLAGS
+
+    # FIXME: this path to rustc (via `which rustc`) may not be quite right in the case
+    # where we're reinstalling the compiler. May want to try for a real
+    # path based on bitbake vars
+    # Also will be wrong when relative libdir and/or bindir aren't 'bin' and 'lib'.
+    local_maybe_enable=disable
+    local_rust_root=/not/set/do/not/use
+    if which rustc >/dev/null 2>&1; then
+        local_rustc=$(which rustc)
+        if [ -n "$local_rustc" ]; then
+            local_rust_root=$(dirname $(dirname $local_rustc))
+            if [ -e "$local_rust_root/bin/rustc" ]; then
+                local_maybe_enable=enable
             fi
         fi
+    fi
 
-	# - rpath is required otherwise rustc fails to resolve symbols
-        # - submodule management is done by bitbake's fetching
-	${S}/configure					\
-		"--enable-rpath"			\
-		"--disable-docs"			\
-		"--disable-manage-submodules"           \
-		"--disable-debug"			\
-		"--enable-debuginfo"			\
-		"--enable-optimize"			\
-		"--enable-optimize-cxx"			\
-		"--disable-llvm-version-check"          \
-		"--llvm-root=${llvmdir}"		\
-		"--enable-optimize-tests"		\
-		"--prefix=${prefix}"			\
-		"--target=${TARGET_SYS}"		\
-		"--host=${HOST_SYS}"			\
-		"--build=${BUILD_SYS}"			\
-		"--localstatedir=${localstatedir}"	\
-		"--sysconfdir=${sysconfdir}"		\
-		"--datadir=${datadir}"			\
-		"--infodir=${infodir}"			\
-		"--mandir=${mandir}"			\
-		"--libdir=${libdir}"			\
-		"--bindir=${bindir}"			\
-		${@bb.utils.contains('PACKAGECONFIG', 'local-rust', '--$local_maybe_enable-local-rust --local-rust-root=$local_rust_root', '--local-rust-root=/not/a/dir', d)} \
-		${EXTRA_OECONF}
+    # - rpath is required otherwise rustc fails to resolve symbols
+    # - submodule management is done by bitbake's fetching
+    ${S}/configure                          \
+        "--enable-rpath"                    \
+        "--disable-docs"                    \
+        "--disable-manage-submodules"       \
+        "--disable-debug"                   \
+        "--enable-optimize"                 \
+        "--enable-optimize-cxx"             \
+        "--disable-llvm-version-check"      \
+        "--llvm-root=${llvmdir}"            \
+        "--enable-optimize-tests"           \
+        "--release-channel=stable"          \
+        "--prefix=${prefix}"                \
+        "--target=${TARGET_SYS}"            \
+        "--host=${HOST_SYS}"                \
+        "--build=${BUILD_SYS}"              \
+        "--localstatedir=${localstatedir}"  \
+        "--sysconfdir=${sysconfdir}"        \
+        "--datadir=${datadir}"              \
+        "--infodir=${infodir}"              \
+        "--mandir=${mandir}"                \
+        "--libdir=${libdir}"                \
+        "--bindir=${bindir}"                \
+        "--platform-cfg=${WORKDIR}/mk-cfg/" \
+        ${@bb.utils.contains('PACKAGECONFIG', 'local-rust', '--$local_maybe_enable-local-rust --local-rust-root=$local_rust_root', '--local-rust-root=/not/a/dir', d)} \
+        ${EXTRA_OECONF}
 }
 
 rust_runmake () {
-	echo "COMPILE ${PN}" "$@"
-	env
+    echo "COMPILE ${PN}" "$@"
+    env
 
-	# 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
+    # 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_runmake "VERBOSE=1" "$@"
+    oe_runmake "VERBOSE=1" "$@"
 }
 
 do_compile () {
-	if ${@bb.utils.contains('PACKAGECONFIG', 'local-rust', 'false', 'true', d)}; then
-		mkdir -p dl
-		cp -f ${WORKDIR}/${RUST_SNAPSHOT} dl
-	fi
-	rust_runmake
+    if ${@bb.utils.contains('PACKAGECONFIG', 'local-rust', 'false', 'true', d)}; then
+        mkdir -p dl
+        cp -f ${WORKDIR}/${RUST_SNAPSHOT} dl
+    fi
+    rust_runmake
 }
 
 rust_do_install () {
-	rust_runmake DESTDIR="${D}" install
+    rust_runmake DESTDIR="${D}" install
 
-        # Rust's install.sh doesn't mark executables as executable because
-        # we're using a custom bindir, do it ourselves.
-        chmod +x "${D}/${bindir}/rustc"
-        chmod +x "${D}/${bindir}/rustdoc"
-        chmod +x "${D}/${bindir}/rust-gdb"
+    # Rust's install.sh doesn't mark executables as executable because
+    # we're using a custom bindir, do it ourselves.
+    chmod +x "${D}/${bindir}/rustc"
+    chmod +x "${D}/${bindir}/rustdoc"
+    chmod +x "${D}/${bindir}/rust-gdb"
 
-        # 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
+    # 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
 
-        ## rust will complain about multiple providers of the runtime libs
-        ## (libstd, libsync, etc.) without this.
-        (cd "${D}${libdir}" && ln -sf "rustlib/${HOST_SYS}/lib/lib"*.so .)
+    # Remove any files directly installed into libdir to avoid
+    # conflicts between cross and native
+    rm -f ${D}${libdir}/lib*.so
 }
 
 do_install () {
-	rust_do_install
+    rust_do_install
 }
 
-## {{{ native bits
-
-# 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"
-
-## }}}
-
-## {{{ cross bits
-
-# Otherwise we'll depend on what we provide
-INHIBIT_DEFAULT_RUST_DEPS_class-cross = "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_class-cross += "${@bb.utils.contains('PACKAGECONFIG', 'local-rust', 'rust-native', '', d)}"
-DEPENDS_class-cross += "rust-llvm-native"
-DEPENDS_class-cross += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
-
-PROVIDES_class-cross = "virtual/${TARGET_PREFIX}rust"
-PN_class-cross = "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_class-cross = " -Wl,-rpath=../../lib"
-BUILD_POST_LINK_ARGS_append_class-cross = " -Wl,-rpath=../../lib"
-
-# We need the same thing for the calls to the compiler when building the runtime crap
-TARGET_CC_ARCH_append_class-cross = " --sysroot=${STAGING_DIR_TARGET}"
-
-# cross.bbclass is "helpful" and overrides our do_install. Tell it not to.
-do_install_class-cross () {
-	rust_do_install
-}
-
-## }}}
-
-BBCLASSEXTEND = "cross native"

recipes-devtools/rust/rust_1.3.0.bb

@@ -1,20 +0,0 @@
-require rust-release.inc
-require rust.inc
-require rust-${PV}.inc
-
-# "patch-prefix"
-PP = "rust-${PV}"
-SRC_URI_append = "\
-        file://${PP}/0001-platform.mk-avoid-choking-on-i586.patch \
-        file://${PP}/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \
-        file://${PP}/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \
-        file://${PP}/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \
-        file://${PP}/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch \
-        file://${PP}/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch \
-        file://${PP}/0007-mk-install-use-disable-rewrite-paths.patch \
-        file://${PP}/0008-install-disable-ldconfig.patch \
-        file://${PP}/0009-Remove-crate-metadata-from-symbol-hashing.patch \
-        file://${PP}/0010-mk-tell-rustc-that-we-re-only-looking-for-native-lib.patch \
-\
-	file://rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \
-"

recipes-devtools/rust/rust_git.bb

@@ -1,29 +0,0 @@
-# 2015-06-26
-SRCREV = "378a370ff2057afeb1eae86eb6e78c476866a4a6"
-require rust-git.inc
-
-RS_DATE = "2015-05-24"
-RS_SRCHASH = "ba0e1cd"
-# linux-x86_64
-RS_HASH = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c"
-RUST_SNAPSHOT = "rust-stage0-${RS_DATE}-${RS_SRCHASH}-linux-x86_64-${RS_HASH}.tar.bz2"
-
-SRC_URI[rust-snapshot.md5sum] = "e0d49475a787aaa9481ec0b1a28d1f7a"
-SRC_URI[rust-snapshot.sha256sum] = "e7858a90c2c6c35299ebe2cb6425f3f84d0ba171dcbce20ff68295a1ff75c7e5"
-
-# "patch-prefix"
-PP = "rust-git"
-SRC_URI_append = "\
-	file://${PP}/0001-platform.mk-avoid-choking-on-i586.patch \
-	file://${PP}/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \
-	file://${PP}/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \
-	file://${PP}/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \
-	file://${PP}/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch \
-	file://${PP}/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch \
-	file://${PP}/0007-mk-install-use-disable-rewrite-paths.patch \
-	file://${PP}/0008-install-disable-ldconfig.patch \
-\
-	file://rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \
-"
-
-DEFAULT_PREFERENCE = "-1"

recipes-devtools/rust/rustlib.bb

@@ -9,7 +9,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}rust"
 RUSTLIB_DEP = ""
 
 do_install () {
-	for f in ${STAGING_DIR_NATIVE}/${rustlib}/*.so; do
+	for f in ${STAGING_DIR_NATIVE}/${rustlib_src}/*.so; do
 		echo Installing $f
 		install -D -m 755 $f ${D}/${rustlib}/$(basename $f)
 	done

recipes-example/rustfmt/rustfmt_0.4.0.bb

@@ -0,0 +1,10 @@
+inherit cargo
+
+SRC_URI = "https://crates.io/api/v1/crates/rustfmt/0.4.0/download;downloadfilename=${P}.tar.gz"
+SRC_URI[md5sum] = "2916b64ad7d6b6c9f33ea89f9b3083c4"
+SRC_URI[sha256sum] = "add2143a74d9dde7ddbfdd325ac6f253656662fd3b6c22600e1fa4b52f9eab01"
+LIC_FILES_CHKSUM="file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SUMMARY = "Format Rust Code"
+HOMEPAGE = "https://github.com/rust-lang-nursery/rustfmt"
+LICENSE = "MIT | Apache-2.0"

scripts/build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Grab the MACHINE from the environment; otherwise, set it to a sane default
+export MACHINE="${MACHINE-qemux86}"
+
+# What to build
+BUILD_TARGETS="\
+    rustfmt \
+    "
+
+die() {
+    echo "$*" >&2
+    exit 1
+}
+
+rm -f build/conf/bblayers.conf || die "failed to nuke bblayers.conf"
+rm -f build/conf/local.conf || die "failed to nuke local.conf"
+
+./scripts/containerize.sh bitbake ${BUILD_TARGETS} || die "failed to build"

scripts/cleanup-env.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+sudo umount build
+
+exit 0

scripts/containerize.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# what container are we using to build this
+CONTAINER="starlabio/yocto:1.5"
+
+einfo() {
+	echo "$*" >&2
+}
+
+die() {
+    echo "$*" >&2
+    exit 1
+}
+
+# Save the commands for future use
+cmd=$@
+
+# If no command was specified, just drop us into a shell if we're interactive
+[ $# -eq 0 ] && tty -s && cmd="/bin/bash"
+
+# user and group we are running as to ensure files created inside
+# the container retain the same permissions
+my_uid=$(id -u)
+my_gid=$(id -g)
+
+# Are we in an interactive terminal?
+tty -s && termint=t
+
+# Fetch the latest version of the container
+einfo "*** Ensuring local container is up to date"
+docker pull ${CONTAINER} > /dev/null || die "Failed to update docker container"
+
+# Ensure we've got what we need for SSH_AUTH_SOCK
+if [[ -n ${SSH_AUTH_SOCK} ]]; then
+	SSH_AUTH_DIR=$(dirname $(readlink -f ${SSH_AUTH_SOCK}))
+	SSH_AUTH_NAME=$(basename ${SSH_AUTH_SOCK})
+fi
+
+# Kick off Docker
+einfo "*** Launching container ..."
+exec docker run \
+    --privileged \
+    -e BUILD_UID=${my_uid} \
+    -e BUILD_GID=${my_gid} \
+    -e TEMPLATECONF=meta-rust/conf \
+    -e MACHINE=${MACHINE:-qemux86} \
+    ${SSH_AUTH_SOCK:+-e SSH_AUTH_SOCK="/tmp/ssh-agent/${SSH_AUTH_NAME}"} \
+    -v ${HOME}/.ssh:/var/build/.ssh \
+    -v "${PWD}":/var/build:rw \
+    ${SSH_AUTH_SOCK:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent} \
+    ${EXTRA_CONTAINER_ARGS} \
+    -${termint}i --rm -- \
+    ${CONTAINER} \
+    ${cmd}

scripts/fetch.sh

@@ -0,0 +1,95 @@
+#!/bin/bash -x
+
+# the repos we want to check out, must setup variables below
+# NOTE: poky must remain first
+REPOS="poky metaoe"
+
+POKY_URI="git://git.yoctoproject.org/poky.git"
+POKY_PATH="poky"
+POKY_REV="${POKY_REV-refs/remotes/origin/$1}"
+
+METAOE_URI="git://git.openembedded.org/meta-openembedded.git"
+METAOE_PATH="poky/meta-openembedded"
+METAOE_REV="${METAOE_REV-refs/remotes/origin/$1}"
+
+METARUST_URI="."
+METARUST_PATH="poky/meta-rust"
+
+die() {
+	echo "$*" >&2
+	exit 1
+}
+
+update_repo() {
+	uri=$1
+	path=$2
+	rev=$3
+
+	# check if we already have it checked out, if so we just want to update
+	if [[ -d ${path} ]]; then
+		pushd ${path} > /dev/null
+		echo "Updating '${path}'"
+		git remote set-url origin "${uri}"
+		git fetch origin || die "unable to fetch ${uri}"
+	else
+		echo "Cloning '${path}'"
+		if [ -z "${GIT_LOCAL_REF_DIR}" ]; then
+			git clone ${uri} ${path} || die "unable to clone ${uri}"
+		else
+			git clone --reference ${GIT_LOCAL_REF_DIR}/`basename ${path}` ${uri} ${path}
+		fi
+		pushd ${path} > /dev/null
+	fi
+
+	# The reset steps are taken from Jenkins
+
+	# Reset
+	# * drop -d from clean to not nuke build/tmp
+	# * add -e to not clear out bitbake bits
+	git reset --hard || die "failed reset"
+	git clean -fx -e bitbake -e meta/lib/oe || die "failed clean"
+
+	# Call the branch what we're basing it on, otherwise use default
+	# if the revision was not a branch.
+	branch=$(basename ${rev})
+	[[ "${branch}" == "${rev}" ]] && branch="default"
+
+	# Create 'default' branch
+	git update-ref refs/heads/${branch} ${rev} || \
+		die "unable to get ${rev} of ${uri}"
+	git config branch.${branch}.remote origin || die "failed config remote"
+	git config branch.${branch}.merge ${rev} || die "failed config merge"
+	git symbolic-ref HEAD refs/heads/${branch} || die "failed symbolic-ref"
+	git reset --hard || die "failed reset"
+	popd > /dev/null
+	echo "Updated '${path}' to '${rev}'"
+}
+
+# For each repo, do the work
+for repo in ${REPOS}; do
+	# upper case the name
+	repo=$(echo ${repo} | tr '[:lower:]' '[:upper:]')
+
+	# expand variables
+	expand_uri="${repo}_URI"
+	expand_path="${repo}_PATH"
+	expand_rev="${repo}_REV"
+	repo_uri=${!expand_uri}
+	repo_path=${!expand_path}
+	repo_rev=${!expand_rev}
+
+	# check that we've got data
+	[[ -z ${repo_uri} ]] && die "No revision defined in ${expand_uri}"
+	[[ -z ${repo_path} ]] && die "No revision defined in ${expand_path}"
+	[[ -z ${repo_rev} ]] && die "No revision defined in ${expand_rev}"
+
+	# now fetch/clone/update repo
+	update_repo "${repo_uri}" "${repo_path}" "${repo_rev}"
+
+done
+
+rm -rf "${METARUST_PATH}" || die "unable to clear old ${METARUST_PATH}"
+ln -sf "../${METARUST_URI}" "${METARUST_PATH}" || \
+	die "unable to symlink ${METARUST_PATH}"
+
+exit 0

scripts/setup-env.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+mkdir -p build
+
+sudo mount -t tmpfs -o size=64G,mode=755,uid=${UID} tmpfs build
+
+exit 0