From 89084f86bd3f2897b2f152cc33c14ac642cc1169 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Tue, 11 Nov 2014 20:32:51 -0500
Subject: [PATCH] more

---
 recipes/cargo/cargo.inc                |  4 ++--
 recipes/cargo/cargo_2014-11-10.bb      | 10 ----------
 recipes/cargo/cargo_2014-11-11.bb      | 10 ++++++++++
 recipes/rust/rust_0.12.0+2014-11-11.bb |  2 ++
 4 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 recipes/cargo/cargo_2014-11-10.bb
 create mode 100644 recipes/cargo/cargo_2014-11-11.bb
 create mode 100644 recipes/rust/rust_0.12.0+2014-11-11.bb

diff --git a/recipes/cargo/cargo.inc b/recipes/cargo/cargo.inc
index a46d4d4..b330580 100644
--- a/recipes/cargo/cargo.inc
+++ b/recipes/cargo/cargo.inc
@@ -19,6 +19,8 @@ PV .= "+git${SRCPV}"
 S = "${WORKDIR}/git"
 B = "${S}"
 
+export RUST_PATH="${RUST_PATH}"
+
 do_configure () {
 	"${S}/configure" \
 		"--prefix=${prefix}"			\
@@ -41,8 +43,6 @@ do_compile () {
 	echo "COMPILE ${PN}"
 	env
 
-	export RUST_PATH="${RUST_PATH}"
-	export LD_LIBRARY_PATH="${RUST_PATH}"
 	oe_runmake ARGS="--verbose"
 }
 
diff --git a/recipes/cargo/cargo_2014-11-10.bb b/recipes/cargo/cargo_2014-11-10.bb
deleted file mode 100644
index cb63733..0000000
--- a/recipes/cargo/cargo_2014-11-10.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SRCREV_cargo = "8cc600a33436a3c75372b252ddecb1f90961d61b"
-require cargo.inc
-
-SRC_URI_append = " \
-	git://github.com/jmesmon/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \
-"
-#git://github.com/jmesmon/libz-sys.git;protocol=https;name=libz-sys;destsuffix=libz-sys
-SRCREV_git2-rs  = "fa270b5eed7e9e94aa7d8bc18fa923d8e6b32ba6"
-#SRCREV_libz-sys = "
-OECARGO_PATH = "${WORKDIR}/git2-rs"
diff --git a/recipes/cargo/cargo_2014-11-11.bb b/recipes/cargo/cargo_2014-11-11.bb
new file mode 100644
index 0000000..42f36a2
--- /dev/null
+++ b/recipes/cargo/cargo_2014-11-11.bb
@@ -0,0 +1,10 @@
+SRCREV_cargo = "f830efaa4ac85e8c8e421aa354d5becb9845e44f"
+require cargo.inc
+
+#SRC_URI_append = " \
+#	git://github.com/jmesmon/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \
+#"
+#git://github.com/jmesmon/libz-sys.git;protocol=https;name=libz-sys;destsuffix=libz-sys
+#SRCREV_git2-rs  = "fa270b5eed7e9e94aa7d8bc18fa923d8e6b32ba6"
+#SRCREV_libz-sys = "
+#OECARGO_PATH = "${WORKDIR}/git2-rs"
diff --git a/recipes/rust/rust_0.12.0+2014-11-11.bb b/recipes/rust/rust_0.12.0+2014-11-11.bb
new file mode 100644
index 0000000..1a60916
--- /dev/null
+++ b/recipes/rust/rust_0.12.0+2014-11-11.bb
@@ -0,0 +1,2 @@
+SRCREV = "5d29209bda553e4d23a8b499d2ceb8db5c4f8be5"
+require rust-git.inc