mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #39 from starlab-io/fix-source-fetch

Browse Source 
Allow the fetch to complete before attempting to patch
This commit is contained in:
Cody Schafer
2016-02-18 22:46:39 -05:00
parent f634a72c3b a4d6b55448
commit c4a3f15a8c
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
classes/shared-source-use.bbclass
View File

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

4
recipes/rust/files/rust-llvm/0000-rust-llvm-remove-extra-slash.patch
View File

@@ -1,5 +1,5 @@
lude/llvm/CodeGen/CommandFlags.h.orig 2016-01-18 19:18:03.847470845 +0000
+++ llvm/include/llvm/CodeGen/CommandFlags.h 2016-01-18 19:18:11.211408270 +0000
+++ 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"

2
recipes/rust/rust-llvm.inc
View File

@@ -5,8 +5,6 @@ LICENSE = "NCSA"
S .= "/src/llvm"
SRC_URI_append = "file://rust-llvm/0000-rust-llvm-remove-extra-slash.patch"
inherit autotools
EXTRA_OECONF += "--enable-targets=x86,x86_64,arm,aarch64,mips,powerpc"

4
recipes/rust/rust-source.bb
View File

@@ -26,6 +26,6 @@ SRC_URI_append = "\
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-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \
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 \
"