From 3406a2920c524af60e44881599f2b7b548ad6f67 Mon Sep 17 00:00:00 2001
From: Derek Straka <derek@starlab.io>
Date: Fri, 13 Nov 2015 11:46:57 -0600
Subject: [PATCH 1/2] Update PR number and pack sstate correctly

---
 recipes/cargo/cargo-native_git.bb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/recipes/cargo/cargo-native_git.bb b/recipes/cargo/cargo-native_git.bb
index 4ceceed..5c808e6 100644
--- a/recipes/cargo/cargo-native_git.bb
+++ b/recipes/cargo/cargo-native_git.bb
@@ -3,6 +3,10 @@ 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 \
@@ -18,8 +22,15 @@ SRC_URI[sha256sum] = "16b6338ba2942989693984ba4dbd057c2801e8805e6da8fa7b781b00e7
 
 S = "${WORKDIR}/cargo-nightly-x86_64-unknown-linux-gnu/"
 
-inherit native 
+inherit native
 
 do_install() {
-    sh ${S}/install.sh --destdir=${STAGING_DIR_NATIVE} --prefix= 
+    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
 }

From a018f9586b5319df397eff6af0635d5641012ced Mon Sep 17 00:00:00 2001
From: Derek Straka <derek@starlab.io>
Date: Sun, 15 Nov 2015 07:44:29 -0600
Subject: [PATCH 2/2] Add no PIE to rust-llvm

---
 conf/distro/include/rust_security_flags.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/include/rust_security_flags.inc b/conf/distro/include/rust_security_flags.inc
index 28aec40..2ab9268 100644
--- a/conf/distro/include/rust_security_flags.inc
+++ b/conf/distro/include/rust_security_flags.inc
@@ -2,3 +2,4 @@
 SECURITY_CFLAGS_pn-rust-native = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-rust-cross = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-rust = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-rust-llvm = "${SECURITY_NO_PIE_CFLAGS}"