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

update rustc to 2015-03-23

Browse Source 
We need a git version of libgit2 again :(

Also fix the license complaints
This commit is contained in:
Cody P Schafer
2015-03-23 19:57:34 -04:00
parent 6fc1459dce
commit d50952c452
22 changed files with 95 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/layer.conf
+2
View File
@@ -7,3 +7,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
BBFILE_COLLECTIONS += "rust-layer" BBFILE_COLLECTIONS += "rust-layer"
BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/" BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_rust-layer = "7" BBFILE_PRIORITY_rust-layer = "7"
LICENSE_PATH += "${LAYERDIR}/files/licenses"
recipes-deps/libgit2/libgit2_git.bb
+3
View File
@@ -0,0 +1,3 @@
require libgit2-git.inc
SRCREV ?= "2a0f67f04cb717a7e57192696d69f91a3d208705"
LIC_FILES_CHKSUM = "file://COPYING;md5=5ddd5fb64b24982b32a490dccccdabc5"
recipes/cargo/cargo_git.bb
+8 -8
View File
@@ -1,5 +1,5 @@
# 2015-03-09 # 2015-03-23
SRCREV_cargo = "e4f0662b4ba7feacc10c19465182b8174aae4e9d" SRCREV_cargo = "8d4bf72bf6b1f997c2e91ec57b79c6bbd2ed65e4"
SRCREV_rust-installer = "60fd8abfcae50629a3fc664bd809238fed039617" SRCREV_rust-installer = "60fd8abfcae50629a3fc664bd809238fed039617"
require cargo.inc require cargo.inc
@@ -20,14 +20,14 @@ SRC_URI += " \
git://github.com/alexcrichton/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2;branch=libgit2-2014-12-19 \ git://github.com/alexcrichton/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2;branch=libgit2-2014-12-19 \
" "
# 0.2.2 / -sys 0.1.16 # 0.2.3 / -sys 0.1.16
SRCREV_curl-rust = "24b1508e8d0c8052f10b1c1ed6c88eb14cae0fda" SRCREV_curl-rust = "8db3885f0e39c748c37d6f5409a055aa8412b81f"
# 0.1.11 / -sys 0.1.8 # 0.2.3 / -sys 0.1.13
SRCREV_ssh2-rs = "80b4350918a236711ed193c06998ddc1af523e17" SRCREV_ssh2-rs = "20051a11312ff1769bd21c461232c0cb8bc99815"
# 0.2.2 / -sys 0.2.1 # 0.2.5 / -sys 0.2.6
SRCREV_git2-rs = "43d1b116360c013293936058c55556b090950e01" SRCREV_git2-rs = "7ba50b6e2170cc73ee55b8de738cf9efb68b6646"
SRCREV_FORMAT .= "_curl-rust_curl_ssh2-rs_git2-rs" SRCREV_FORMAT .= "_curl-rust_curl_ssh2-rs_git2-rs"
EXTRA_OECARGO_PATHS = "\ EXTRA_OECARGO_PATHS = "\
recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch
+2 -2
View File
@@ -1,4 +1,4 @@
From bdf481d61083100ecb297c77e812db704ad10a15 Mon Sep 17 00:00:00 2001 From 03c23cce2e617e4d0902e9adf0a9caa7e27b9699 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Tue, 25 Nov 2014 11:50:28 -0500 Date: Tue, 25 Nov 2014 11:50:28 -0500
Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is
@@ -48,5 +48,5 @@ index 0a224a4..1328834 100644
use libc::{c_void, c_int, c_char, c_uint, c_long}; use libc::{c_void, c_int, c_char, c_uint, c_long};
-- --
2.3.1 2.3.3
recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 66d0d329df945866abe602172980e62668e20f5b Mon Sep 17 00:00:00 2001 From 910c8fe2c439ed79451e5bcfb01dedbd4c8225cb Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Tue, 25 Nov 2014 12:26:48 -0500 Date: Tue, 25 Nov 2014 12:26:48 -0500
Subject: [PATCH 2/2] remove per-triple deps on openssl-sys Subject: [PATCH 2/2] remove per-triple deps on openssl-sys
@@ -8,7 +8,7 @@ Subject: [PATCH 2/2] remove per-triple deps on openssl-sys
1 file changed, 1 insertion(+), 18 deletions(-) 1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index cd886be..3682f8a 100644 index 1554aea..3a6efa3 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -10,6 +10,7 @@ description = "Rust bindings to libcurl for making HTTP requests" @@ -10,6 +10,7 @@ description = "Rust bindings to libcurl for making HTTP requests"
@@ -42,5 +42,5 @@ index cd886be..3682f8a 100644
-[target.x86_64-unknown-freebsd.dependencies] -[target.x86_64-unknown-freebsd.dependencies]
-openssl-sys = "0.5.1" -openssl-sys = "0.5.1"
-- --
2.3.1 2.3.3
recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 04f59e215eb3ebe0a3d5b0ebe99188b4dd4058b9 Mon Sep 17 00:00:00 2001 From ff3a41ab9e7da8aeb35f66c7f6496566f9305fa8 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 10 Nov 2014 15:06:29 -0500 Date: Mon, 10 Nov 2014 15:06:29 -0500
Subject: [PATCH] Add generic openssl-sys dep Subject: [PATCH] Add generic openssl-sys dep
@@ -8,7 +8,7 @@ Subject: [PATCH] Add generic openssl-sys dep
1 file changed, 2 insertions(+), 25 deletions(-) 1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml
index 41b6bcb..8018d8f 100644 index efea9f3..27e3783 100644
--- a/libgit2-sys/Cargo.toml --- a/libgit2-sys/Cargo.toml
+++ b/libgit2-sys/Cargo.toml +++ b/libgit2-sys/Cargo.toml
@@ -16,31 +16,8 @@ description = "Native bindings to the libgit2 library" @@ -16,31 +16,8 @@ description = "Native bindings to the libgit2 library"
@@ -46,5 +46,5 @@ index 41b6bcb..8018d8f 100644
-openssl-sys = "0.5.0" -openssl-sys = "0.5.0"
-libz-sys = "0.1.0" -libz-sys = "0.1.0"
-- --
2.3.1 2.3.3
recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From c9a0ea1470ce440b877cd276fd591c2be4f5c753 Mon Sep 17 00:00:00 2001 From c4bea40ae7d77d7fe7b3a1a9a4e31597fea2d8ad Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 1 Dec 2014 10:51:31 -0500 Date: Mon, 1 Dec 2014 10:51:31 -0500
Subject: [PATCH] Unconditionally depend on openssl-sys Subject: [PATCH] Unconditionally depend on openssl-sys
@@ -8,7 +8,7 @@ Subject: [PATCH] Unconditionally depend on openssl-sys
1 file changed, 18 deletions(-) 1 file changed, 18 deletions(-)
diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
index e22f03f..9cd10ee 100644 index 56545c4..80844bd 100644
--- a/libssh2-sys/Cargo.toml --- a/libssh2-sys/Cargo.toml
+++ b/libssh2-sys/Cargo.toml +++ b/libssh2-sys/Cargo.toml
@@ -15,24 +15,6 @@ path = "lib.rs" @@ -15,24 +15,6 @@ path = "lib.rs"
@@ -37,5 +37,5 @@ index e22f03f..9cd10ee 100644
[build-dependencies] [build-dependencies]
-- --
2.3.1 2.3.3
recipes/rust/files/0001-libstd-io-process-Command-fully-quote-and-escape-the.patch
+6 -6
View File
@@ -1,7 +1,7 @@
From 853675a3609aeb09e0fc6a00e84b8ab4c782a332 Mon Sep 17 00:00:00 2001 From 116d45a000c9ce5a9bcba8c413066c5179cfac05 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Wed, 26 Nov 2014 10:00:32 -0500 Date: Wed, 26 Nov 2014 10:00:32 -0500
Subject: [PATCH 01/14] libstd/io/process/Command: fully quote and escape the Subject: [PATCH 01/13] libstd/io/process/Command: fully quote and escape the
command and all args command and all args
This makes the command (which may have trailing or leading white space This makes the command (which may have trailing or leading white space
@@ -15,10 +15,10 @@ shell.
1 file changed, 28 insertions(+), 3 deletions(-) 1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs
index e02e863..2381b6a 100644 index 54fd20f4..d201f3b 100644
--- a/src/libstd/old_io/process.rs --- a/src/libstd/old_io/process.rs
+++ b/src/libstd/old_io/process.rs +++ b/src/libstd/old_io/process.rs
@@ -33,6 +33,7 @@ use sync::mpsc::{channel, Receiver}; @@ -34,6 +34,7 @@ use sync::mpsc::{channel, Receiver};
use sys::fs::FileDesc; use sys::fs::FileDesc;
use sys::process::Process as ProcessImp; use sys::process::Process as ProcessImp;
use sys; use sys;
@@ -26,7 +26,7 @@ index e02e863..2381b6a 100644
use thread; use thread;
#[cfg(windows)] use hash; #[cfg(windows)] use hash;
@@ -397,15 +398,39 @@ impl Command { @@ -400,15 +401,39 @@ impl Command {
} }
} }
@@ -70,5 +70,5 @@ index e02e863..2381b6a 100644
Ok(()) Ok(())
} }
-- --
2.3.1 2.3.3
recipes/rust/files/0002-std-io-process-add-Debug-tests.patch
+7 -7
View File
@@ -1,19 +1,19 @@
From 201c382eb7da7b74915f431617f839281d3451d2 Mon Sep 17 00:00:00 2001 From 50cac2149528f7400c7623e5fd31cf579e18a82b Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 1 Dec 2014 15:50:13 -0500 Date: Mon, 1 Dec 2014 15:50:13 -0500
Subject: [PATCH 02/14] std/io/process: add Debug tests Subject: [PATCH 02/13] std/io/process: add Debug tests
--- ---
src/libstd/old_io/process.rs | 12 ++++++++++++ src/libstd/old_io/process.rs | 12 ++++++++++++
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs
index 2381b6a..fd895aa 100644 index d201f3b..f4dbd68 100644
--- a/src/libstd/old_io/process.rs --- a/src/libstd/old_io/process.rs
+++ b/src/libstd/old_io/process.rs +++ b/src/libstd/old_io/process.rs
@@ -1257,4 +1257,16 @@ mod tests { @@ -1262,4 +1262,16 @@ mod tests {
let val = env.get(&EnvKey(CString::new(b"PATH").unwrap())); let val = env.get(&EnvKey(CString::new("PATH").unwrap()));
assert!(val.unwrap() == &CString::new(b"bar").unwrap()); assert!(val.unwrap() == &CString::new("bar").unwrap());
} }
+ +
+ fn check_debug<D : fmt::Debug>(c: D, v: &str) { + fn check_debug<D : fmt::Debug>(c: D, v: &str) {
@@ -29,5 +29,5 @@ index 2381b6a..fd895aa 100644
+ } + }
} }
-- --
2.3.1 2.3.3
recipes/rust/files/0003-platform.mk-avoid-choking-on-i586.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From f0e1084b376a00de29a881b3f3a27eefa7ea0a26 Mon Sep 17 00:00:00 2001 From 6ad97fa123626a4d13d7c761683245e76784902b Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Sat, 15 Nov 2014 20:12:48 -0500 Date: Sat, 15 Nov 2014 20:12:48 -0500
Subject: [PATCH 03/14] platform.mk: avoid choking on i586 Subject: [PATCH 03/13] platform.mk: avoid choking on i586
--- ---
mk/platform.mk | 4 +++- mk/platform.mk | 4 +++-
@@ -23,5 +23,5 @@ index ed50585..14221d7 100644
$(foreach t,$(CFG_TARGET),$(eval $(call DEF_HOST_VAR,$(t)))) $(foreach t,$(CFG_TARGET),$(eval $(call DEF_HOST_VAR,$(t))))
$(foreach t,$(CFG_TARGET),$(info cfg: host for $(t) is $(HOST_$(t)))) $(foreach t,$(CFG_TARGET),$(info cfg: host for $(t) is $(HOST_$(t))))
-- --
2.3.1 2.3.3
recipes/rust/files/0004-Target-add-default-target.json-path-libdir-rust-targ.patch
+4 -4
View File
@@ -1,7 +1,7 @@
From fc801fb0ea65149fcea4ba015338f43d6fb74be2 Mon Sep 17 00:00:00 2001 From 0c6d20636de66db860c441e097b21df04243c392 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Tue, 18 Nov 2014 01:40:21 -0500 Date: Tue, 18 Nov 2014 01:40:21 -0500
Subject: [PATCH 04/14] Target: add default target.json path: Subject: [PATCH 04/13] Target: add default target.json path:
$libdir/rust/targets $libdir/rust/targets
--- ---
@@ -11,7 +11,7 @@ Subject: [PATCH 04/14] Target: add default target.json path:
3 files changed, 21 insertions(+), 9 deletions(-) 3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 1b09be0..055e733 100644 index e368a66..4ea57b0 100644
--- a/src/librustc/session/config.rs --- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs
@@ -38,7 +38,7 @@ use std::collections::HashMap; @@ -38,7 +38,7 @@ use std::collections::HashMap;
@@ -110,5 +110,5 @@ index 4663901..f8e00c3 100644
if p.is_file() { if p.is_file() {
return load_file(&p); return load_file(&p);
-- --
2.3.1 2.3.3
recipes/rust/files/0005-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
+7 -7
View File
@@ -1,7 +1,7 @@
From c6f41099f8d1f183b8d08c0b59825ce459bdc2d4 Mon Sep 17 00:00:00 2001 From 9214b3532667cf8f734acd4e61beaec2e52cd09f Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Tue, 18 Nov 2014 14:52:56 -0500 Date: Tue, 18 Nov 2014 14:52:56 -0500
Subject: [PATCH 05/14] mk: for stage0, use RUSTFLAGS to override target libs Subject: [PATCH 05/13] mk: for stage0, use RUSTFLAGS to override target libs
dir dir
Setting HLIB specially for stage0 (and even more specially for windows) Setting HLIB specially for stage0 (and even more specially for windows)
@@ -13,10 +13,10 @@ stage0-rustc at the appropriate location.
1 file changed, 11 insertions(+), 8 deletions(-) 1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/mk/main.mk b/mk/main.mk diff --git a/mk/main.mk b/mk/main.mk
index c00494b..984f9c0 100644 index b9f2cf1..f8c0488 100644
--- a/mk/main.mk --- a/mk/main.mk
+++ b/mk/main.mk +++ b/mk/main.mk
@@ -361,21 +361,22 @@ define SREQ @@ -362,21 +362,22 @@ define SREQ
# Destinations of artifacts for the host compiler # Destinations of artifacts for the host compiler
HROOT$(1)_H_$(3) = $(3)/stage$(1) HROOT$(1)_H_$(3) = $(3)/stage$(1)
HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
@@ -47,7 +47,7 @@ index c00494b..984f9c0 100644
# Preqrequisites for using the stageN compiler # Preqrequisites for using the stageN compiler
ifeq ($(1),0) ifeq ($(1),0)
HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
@@ -487,6 +488,7 @@ STAGE$(1)_T_$(2)_H_$(3) := \ @@ -488,6 +489,7 @@ STAGE$(1)_T_$(2)_H_$(3) := \
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \ $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \ --cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \ $$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
@@ -55,7 +55,7 @@ index c00494b..984f9c0 100644
$$(RUSTC_FLAGS_$(2)) $$(RUSTC_FLAGS_$(2))
PERF_STAGE$(1)_T_$(2)_H_$(3) := \ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
@@ -495,6 +497,7 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \ @@ -496,6 +498,7 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \ $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \ --cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \ $$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
@@ -64,5 +64,5 @@ index c00494b..984f9c0 100644
endef endef
-- --
2.3.1 2.3.3
recipes/rust/files/0006-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From bb95f40560c254a8e2a605a7cdeaaf4145487749 Mon Sep 17 00:00:00 2001 From 3f457496ba8184b44f74507c65f79e0819d62a4e Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Tue, 18 Nov 2014 13:48:14 -0500 Date: Tue, 18 Nov 2014 13:48:14 -0500
Subject: [PATCH 06/14] mk: add missing CFG_LIBDIR_RELATIVE Subject: [PATCH 06/13] mk: add missing CFG_LIBDIR_RELATIVE
--- ---
mk/grammar.mk | 4 ++-- mk/grammar.mk | 4 ++--
@@ -23,5 +23,5 @@ index d9c66e2..585206d 100644
ifeq ($(CFG_OSTYPE),apple-darwin) ifeq ($(CFG_OSTYPE),apple-darwin)
FLEX_LDFLAGS=-ll FLEX_LDFLAGS=-ll
-- --
2.3.1 2.3.3
recipes/rust/files/0007-configure-support-bindir-and-extend-libdir-to-non-bl.patch
+14 -14
View File
@@ -1,7 +1,7 @@
From 6aa48e1c7e299eda8cc40e95f9027d9c61eabd54 Mon Sep 17 00:00:00 2001 From 4113b24b2f14225ada5e21fd409042e855de69dc Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 24 Nov 2014 13:10:15 -0500 Date: Mon, 24 Nov 2014 13:10:15 -0500
Subject: [PATCH 07/14] configure: support --bindir, and extend libdir to Subject: [PATCH 07/13] configure: support --bindir, and extend libdir to
non-blessed dirs non-blessed dirs
Adds --bindir, and: Adds --bindir, and:
@@ -23,7 +23,7 @@ windows platforms
7 files changed, 88 insertions(+), 69 deletions(-) 7 files changed, 88 insertions(+), 69 deletions(-)
diff --git a/configure b/configure diff --git a/configure b/configure
index d56000b..9026ae1 100755 index fdc28ee..d63956a 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -309,6 +309,31 @@ envopt() { @@ -309,6 +309,31 @@ envopt() {
@@ -58,7 +58,7 @@ index d56000b..9026ae1 100755
to_llvm_triple() { to_llvm_triple() {
case $1 in case $1 in
i686-w64-mingw32) echo i686-pc-windows-gnu ;; i686-w64-mingw32) echo i686-pc-windows-gnu ;;
@@ -563,6 +588,8 @@ putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins. @@ -566,6 +591,8 @@ putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
CFG_HOST=$(to_llvm_triple $CFG_HOST) CFG_HOST=$(to_llvm_triple $CFG_HOST)
CFG_TARGET=$(to_llvm_triple $CFG_TARGET) CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
@@ -67,7 +67,7 @@ index d56000b..9026ae1 100755
# On windows we just store the libraries in the bin directory because # 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; # there's no rpath. This is where the build system itself puts libraries;
# --libdir is used to configure the installation directory. # --libdir is used to configure the installation directory.
@@ -570,23 +597,15 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET) @@ -573,23 +600,15 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] if [ "$CFG_OSTYPE" = "pc-windows-gnu" ]
then then
CFG_LIBDIR_RELATIVE=bin CFG_LIBDIR_RELATIVE=bin
@@ -96,7 +96,7 @@ index d56000b..9026ae1 100755
fi fi
if [ $HELP -eq 1 ] if [ $HELP -eq 1 ]
@@ -595,6 +614,11 @@ then @@ -598,6 +617,11 @@ then
exit 0 exit 0
fi fi
@@ -108,7 +108,7 @@ index d56000b..9026ae1 100755
# Validate Options # Validate Options
step_msg "validating $CFG_SELF args" step_msg "validating $CFG_SELF args"
validate_opt validate_opt
@@ -1361,6 +1385,7 @@ putvar CFG_PREFIX @@ -1365,6 +1389,7 @@ putvar CFG_PREFIX
putvar CFG_HOST putvar CFG_HOST
putvar CFG_TARGET putvar CFG_TARGET
putvar CFG_LIBDIR_RELATIVE putvar CFG_LIBDIR_RELATIVE
@@ -136,10 +136,10 @@ index 59a0095..b8e8345 100644
endef endef
diff --git a/mk/main.mk b/mk/main.mk diff --git a/mk/main.mk b/mk/main.mk
index 984f9c0..65d6f70 100644 index f8c0488..db19ae4 100644
--- a/mk/main.mk --- a/mk/main.mk
+++ b/mk/main.mk +++ b/mk/main.mk
@@ -330,7 +330,9 @@ export CFG_RELEASE_CHANNEL @@ -331,7 +331,9 @@ export CFG_RELEASE_CHANNEL
export CFG_LLVM_ROOT export CFG_LLVM_ROOT
export CFG_PREFIX export CFG_PREFIX
export CFG_LIBDIR export CFG_LIBDIR
@@ -149,7 +149,7 @@ index 984f9c0..65d6f70 100644
export CFG_DISABLE_INJECT_STD_VERSION export CFG_DISABLE_INJECT_STD_VERSION
ifdef CFG_DISABLE_UNSTABLE_FEATURES ifdef CFG_DISABLE_UNSTABLE_FEATURES
CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES)) CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
@@ -360,7 +362,16 @@ define SREQ @@ -361,7 +363,16 @@ define SREQ
# Destinations of artifacts for the host compiler # Destinations of artifacts for the host compiler
HROOT$(1)_H_$(3) = $(3)/stage$(1) HROOT$(1)_H_$(3) = $(3)/stage$(1)
@@ -187,7 +187,7 @@ index 16cbaab..f8a354c 100644
endif endif
diff --git a/mk/prepare.mk b/mk/prepare.mk diff --git a/mk/prepare.mk b/mk/prepare.mk
index f1c4aa6..37c0a1a 100644 index 4ded8a7..84c7bf2 100644
--- a/mk/prepare.mk --- a/mk/prepare.mk
+++ b/mk/prepare.mk +++ b/mk/prepare.mk
@@ -168,10 +168,10 @@ INSTALL_DEBUGGER_SCRIPT_COMMANDS=$(if $(findstring windows,$(1)),\ @@ -168,10 +168,10 @@ INSTALL_DEBUGGER_SCRIPT_COMMANDS=$(if $(findstring windows,$(1)),\
@@ -335,10 +335,10 @@ index 22a4a6f..ed21d50 100644
// The name of rustc's own place to organize libraries. // The name of rustc's own place to organize libraries.
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
index 3087a8e..891698a 100644 index 34a23f3..5a81790 100644
--- a/src/librustc_trans/back/link.rs --- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs
@@ -1020,11 +1020,10 @@ fn link_args(cmd: &mut Command, @@ -1015,11 +1015,10 @@ fn link_args(cmd: &mut Command,
// where extern libraries might live, based on the // where extern libraries might live, based on the
// addl_lib_search_paths // addl_lib_search_paths
if sess.opts.cg.rpath { if sess.opts.cg.rpath {
@@ -352,5 +352,5 @@ index 3087a8e..891698a 100644
path.push(&tlib); path.push(&tlib);
-- --
2.3.1 2.3.3
recipes/rust/files/0008-Parallelize-submake-invocations.patch
+6 -7
View File
@@ -1,7 +1,7 @@
From d3e5ed1cd54f4534f830011846fa7a08f5a8db3e Mon Sep 17 00:00:00 2001 From 40e421711db1c44f18f4e7ecdb337e7f7fe2a22c Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 24 Nov 2014 13:54:42 -0500 Date: Mon, 24 Nov 2014 13:54:42 -0500
Subject: [PATCH 08/14] Parallelize submake invocations Subject: [PATCH 08/13] Parallelize submake invocations
--- ---
mk/clean.mk | 2 +- mk/clean.mk | 2 +-
@@ -53,7 +53,7 @@ index 8850cd7..8878cf5 100644
ifeq ($(CFG_DISABLE_DOCS),) 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)"
diff --git a/mk/llvm.mk b/mk/llvm.mk diff --git a/mk/llvm.mk b/mk/llvm.mk
index b07c2a1..683dc60 100644 index 1861dd3..00c39f8 100644
--- a/mk/llvm.mk --- a/mk/llvm.mk
+++ b/mk/llvm.mk +++ b/mk/llvm.mk
@@ -28,7 +28,7 @@ LLVM_STAMP_$(1) = $$(CFG_LLVM_BUILD_DIR_$(1))/llvm-auto-clean-stamp @@ -28,7 +28,7 @@ LLVM_STAMP_$(1) = $$(CFG_LLVM_BUILD_DIR_$(1))/llvm-auto-clean-stamp
@@ -108,17 +108,16 @@ index 527485c..5d82a11 100644
$$(Q)cp $$(BACKTRACE_BUILD_DIR_$(1))/.libs/libbacktrace.a $$@ $$(Q)cp $$(BACKTRACE_BUILD_DIR_$(1))/.libs/libbacktrace.a $$@
diff --git a/mk/util.mk b/mk/util.mk diff --git a/mk/util.mk b/mk/util.mk
index 3bbc8f4..4300b02 100644 index b419c0b..0dd68dd 100644
--- a/mk/util.mk --- a/mk/util.mk
+++ b/mk/util.mk +++ b/mk/util.mk
@@ -16,5 +16,7 @@ else @@ -16,4 +16,6 @@ else
E = echo $(1) E = echo $(1)
endif endif
+P = + +P = +
+ +
S := $(CFG_SRC_DIR) S := $(CFG_SRC_DIR)
-- --
2.3.1 2.3.3
recipes/rust/files/0009-std-thread_local-workaround-for-NULL-__dso_handle.patch
+4 -4
View File
@@ -1,14 +1,14 @@
From 60877d415f3a1f61c5913de68813e1f869673d57 Mon Sep 17 00:00:00 2001 From 1d2eadd39ff0d51f28be970aa081979242de8da1 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Wed, 3 Dec 2014 19:15:19 -0500 Date: Wed, 3 Dec 2014 19:15:19 -0500
Subject: [PATCH 09/14] std/thread_local: workaround for NULL __dso_handle Subject: [PATCH 09/13] std/thread_local: workaround for NULL __dso_handle
--- ---
src/libstd/thread_local/mod.rs | 2 +- src/libstd/thread_local/mod.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs
index 6bba734..9abed37 100644 index 0878029..cbadc28 100644
--- a/src/libstd/thread_local/mod.rs --- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs
@@ -402,7 +402,7 @@ mod imp { @@ -402,7 +402,7 @@ mod imp {
@@ -21,5 +21,5 @@ index 6bba734..9abed37 100644
arg: *mut u8, arg: *mut u8,
dso_handle: *mut u8) -> libc::c_int; dso_handle: *mut u8) -> libc::c_int;
-- --
2.3.1 2.3.3
recipes/rust/files/0010-configure-install-support-disabling-calling-of-ldcon.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From c672135095f7335b98d46f2e378d4dc5b335bbf7 Mon Sep 17 00:00:00 2001 From d009973a538bc272b51e8502116918329dbb97ae Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 2 Mar 2015 12:57:24 -0500 Date: Mon, 2 Mar 2015 12:57:24 -0500
Subject: [PATCH 10/14] configure & install: support disabling calling of Subject: [PATCH 10/13] configure & install: support disabling calling of
ldconfig ldconfig
--- ---
@@ -10,10 +10,10 @@ Subject: [PATCH 10/14] configure & install: support disabling calling of
2 files changed, 9 insertions(+), 4 deletions(-) 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/configure b/configure diff --git a/configure b/configure
index 9026ae1..92858c3 100755 index d63956a..822b8f7 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -554,6 +554,7 @@ opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM" @@ -557,6 +557,7 @@ opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
opt rpath 0 "build rpaths into rustc itself" opt rpath 0 "build rpaths into rustc itself"
opt nightly 0 "build nightly packages" opt nightly 0 "build nightly packages"
opt verify-install 1 "verify installed binaries work" opt verify-install 1 "verify installed binaries work"
@@ -61,5 +61,5 @@ index 8878cf5..c8bed09 100644
$(Q)rm -R tmp/dist $(Q)rm -R tmp/dist
-- --
2.3.1 2.3.3
recipes/rust/files/0011-mk-install-use-disable-rewrite-paths.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From 513486437ad3ee406edf87ba95651542180df119 Mon Sep 17 00:00:00 2001 From fe2537c9f307b81b12b39aba612b9d8ceb61b762 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 2 Mar 2015 13:34:59 -0500 Date: Mon, 2 Mar 2015 13:34:59 -0500
Subject: [PATCH 11/14] mk/install: use disable-rewrite-paths Subject: [PATCH 11/13] mk/install: use disable-rewrite-paths
This stops the install scripts from doing work we've already handled. This stops the install scripts from doing work we've already handled.
@@ -39,5 +39,5 @@ index c8bed09..edaea49 100644
$(Q)rm -R tmp/dist $(Q)rm -R tmp/dist
-- --
2.3.1 2.3.3
recipes/rust/files/0012-filesearch-add-info-to-show-path-searching.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From 7d59fe5bcbb3babc149d70e517506ba3e0b9de4e Mon Sep 17 00:00:00 2001 From df8c5991b2417ab0458efc114f0fe458143a2c00 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 9 Mar 2015 16:33:27 -0400 Date: Mon, 9 Mar 2015 16:33:27 -0400
Subject: [PATCH 12/14] filesearch: add info! to show path searching Subject: [PATCH 12/13] filesearch: add info! to show path searching
--- ---
src/librustc/metadata/filesearch.rs | 3 +++ src/librustc/metadata/filesearch.rs | 3 +++
@@ -36,5 +36,5 @@ index ed21d50..d6dc516 100644
FileMatches => { FileMatches => {
break; break;
-- --
2.3.1 2.3.3
recipes/rust/files/0013-configure-enable-debug-now-also-sets-C-debug-asserti.patch
-26
View File
@@ -1,26 +0,0 @@
From f5e0324c7de14e7c264ce717f2aeb1ebcfd78933 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 9 Mar 2015 16:33:48 -0400
Subject: [PATCH 13/14] configure: --enable-debug now also sets -C
debug-assertions=y so `debug!()` works again
---
mk/main.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mk/main.mk b/mk/main.mk
index 65d6f70..22b0224 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -130,7 +130,7 @@ ifdef CFG_DISABLE_DEBUG
CFG_RUSTC_FLAGS += --cfg ndebug
else
$(info cfg: enabling more debugging (CFG_ENABLE_DEBUG))
- CFG_RUSTC_FLAGS += --cfg debug
+ CFG_RUSTC_FLAGS += --cfg debug -C debug-assertions=on
endif
ifdef SAVE_TEMPS
--
2.3.1
recipes/rust/files/0014-filesearch-fix-for-new-path.patch → recipes/rust/files/0013-filesearch-fix-for-new-path.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From 2c23c8dba0769ad0e9c4b0a1130410fdccbf8671 Mon Sep 17 00:00:00 2001 From 029b75f89707bb47f1fae0e02312525661233e96 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com> From: Cody P Schafer <dev@codyps.com>
Date: Mon, 9 Mar 2015 17:29:02 -0400 Date: Mon, 9 Mar 2015 17:29:02 -0400
Subject: [PATCH 14/14] filesearch: fix for new path Subject: [PATCH 13/13] filesearch: fix for new path
--- ---
src/librustc/metadata/filesearch.rs | 5 +++++ src/librustc/metadata/filesearch.rs | 5 +++++
@@ -24,5 +24,5 @@ index d6dc516..3946376 100644
} }
None => panic!("can't determine value for sysroot") None => panic!("can't determine value for sysroot")
-- --
2.3.1 2.3.3
recipes/rust/rust_git.bb
+3 -4
View File
@@ -1,5 +1,5 @@
# 2015-03-09 # 2015-03-23
SRCREV = "91bdf23f504f79ed59617cde3dfebd3d5e39a476" SRCREV = "b0aad7dd4fad8d7e2e2f877a511a637258949597"
require rust-git.inc require rust-git.inc
SRC_URI_append = "\ SRC_URI_append = "\
@@ -15,8 +15,7 @@ SRC_URI_append = "\
file://0010-configure-install-support-disabling-calling-of-ldcon.patch \ file://0010-configure-install-support-disabling-calling-of-ldcon.patch \
file://0011-mk-install-use-disable-rewrite-paths.patch \ file://0011-mk-install-use-disable-rewrite-paths.patch \
file://0012-filesearch-add-info-to-show-path-searching.patch \ file://0012-filesearch-add-info-to-show-path-searching.patch \
file://0013-configure-enable-debug-now-also-sets-C-debug-asserti.patch \
file://0014-filesearch-fix-for-new-path.patch \
\ \
file://rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \ file://rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \
" "
#file://0013-filesearch-fix-for-new-path.patch \