From a1ca1ed06d649efd28d9d4ba9e45954d128fbb5c Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Mon, 31 Oct 2016 11:52:58 -0500
Subject: [PATCH] rust-llvm: stop using shared source

Convert rust-llvm to not use the shared source setup and instead use its
own extracted directory. Include the version info in the bitbake file so
that in the future we can support multiple versions via a
PREFERRED_VERSIONS variable.
---
 recipes-devtools/rust/rust-llvm.bb        |  9 ---------
 recipes-devtools/rust/rust-llvm.inc       | 11 ++++++++---
 recipes-devtools/rust/rust-llvm_1.10.0.bb | 10 ++++++++++
 3 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 recipes-devtools/rust/rust-llvm.bb
 create mode 100644 recipes-devtools/rust/rust-llvm_1.10.0.bb

diff --git a/recipes-devtools/rust/rust-llvm.bb b/recipes-devtools/rust/rust-llvm.bb
deleted file mode 100644
index 62fb3d4..0000000
--- a/recipes-devtools/rust/rust-llvm.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require rust-llvm.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
-
-do_install_append () {
-	cd "${B}"
-	install -d "${D}${bindir}"
-	install -m755 "Release/bin/FileCheck" "${D}${bindir}"
-}
diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc
index 0ed6096..3c94492 100644
--- a/recipes-devtools/rust/rust-llvm.inc
+++ b/recipes-devtools/rust/rust-llvm.inc
@@ -1,9 +1,14 @@
-require rust-shared-source.inc
-
 SUMMARY = "LLVM compiler framework (packaged with rust)"
 LICENSE = "NCSA"
 
-S .= "/src/llvm"
+SRC_URI = "\
+	https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust \
+	file://rust-llvm/0001-Don-t-build-unittests.patch \
+"
+
+S = "${WORKDIR}/rustc-${PV}/src/llvm"
+
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
 
 inherit autotools
 
diff --git a/recipes-devtools/rust/rust-llvm_1.10.0.bb b/recipes-devtools/rust/rust-llvm_1.10.0.bb
new file mode 100644
index 0000000..36a8212
--- /dev/null
+++ b/recipes-devtools/rust/rust-llvm_1.10.0.bb
@@ -0,0 +1,10 @@
+require rust-llvm.inc
+
+SRC_URI[rust.md5sum] = "a48fef30353fc9daa70b484b690ce5db"
+SRC_URI[rust.sha256sum] = "a4015aacf4f6d8a8239253c4da46e7abaa8584f8214d1828d2ff0a8f56176869"
+
+do_install_append () {
+	cd "${B}"
+	install -d "${D}${bindir}"
+	install -m755 "Release/bin/FileCheck" "${D}${bindir}"
+}