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

cargo bump, rustc fixups

Browse Source
This commit is contained in:
Cody P Schafer
2015-03-01 23:18:01 -05:00
parent cd348b34b0
commit 3d0f16ce11
11 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/cargo/cargo_git.bb
+2 -2
View File
@@ -1,5 +1,5 @@
# 2015-2-19
SRCREV_cargo = "43755c00e8a93a3478a1179bca98a7f8b56ecbca"
# 2015-3-01
SRCREV_cargo = "efa4bd0897c4adb46169f2b2359613d394e55759"
require cargo.inc
recipes/rust/files/0001-libstd-io-process-Command-fully-quote-and-escape-the.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 6cf42137235a198163c4a4930e6ae773a9367102 Mon Sep 17 00:00:00 2001
From 146ea5d4ada08dcc237ba759d19e2729511d46e8 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Wed, 26 Nov 2014 10:00:32 -0500
Subject: [PATCH 01/10] libstd/io/process/Command: fully quote and escape the
recipes/rust/files/0002-std-io-process-add-Debug-tests.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 258a6258b9c2411a1487866c33042daa2639921f Mon Sep 17 00:00:00 2001
From c227b05fab797ec7c03ffafea171af0d46a928ff Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 1 Dec 2014 15:50:13 -0500
Subject: [PATCH 02/10] std/io/process: add Debug tests
recipes/rust/files/0003-platform.mk-avoid-choking-on-i586.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 629e15f843d21d19603545bd1bcdb1e8609dc2a9 Mon Sep 17 00:00:00 2001
From 569b5bed4cd94c85db41ea6b0a1c3cc6aa977e43 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Sat, 15 Nov 2014 20:12:48 -0500
Subject: [PATCH 03/10] platform.mk: avoid choking on i586
recipes/rust/files/0004-mk-rt-compiler_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 5d06d2f437e94e4ece0a5fb2b03674d1424caff6 Mon Sep 17 00:00:00 2001
From 6e54f848c836fe95401672c8a4696e885cd6becf Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 17 Nov 2014 16:14:15 -0500
Subject: [PATCH 04/10] mk/rt/compiler_rt: pass LDFLAGS from
recipes/rust/files/0005-Target-add-default-target.json-path-libdir-rust-targ.patch
+5 -5
View File
@@ -1,4 +1,4 @@
From 46eeadcd2010498fcff6778b487d7bb32b7b9aa4 Mon Sep 17 00:00:00 2001
From 9d4c54f58e86009b4a550d92de5e741da30ac4f4 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Tue, 18 Nov 2014 01:40:21 -0500
Subject: [PATCH 05/10] Target: add default target.json path:
@@ -31,10 +31,10 @@ index efcde8b..dba6f98 100644
let (int_type, uint_type) = match &target.target_pointer_width[..] {
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 67c39bc..17a28a7 100644
index 99b2fce..780b863 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -336,14 +336,18 @@ pub fn build_session_(sopts: config::Options,
@@ -337,14 +337,18 @@ pub fn build_session_(sopts: config::Options,
local_crate_source_file: Option<Path>,
span_diagnostic: diagnostic::SpanHandler)
-> Session {
@@ -56,7 +56,7 @@ index 67c39bc..17a28a7 100644
let default_sysroot = match sopts.maybe_sysroot {
Some(_) => None,
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index d09a7c3..7bfabac 100644
index d09a7c3..7a8e293 100644
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -308,13 +308,14 @@ impl Target {
@@ -80,7 +80,7 @@ index d09a7c3..7bfabac 100644
let target_path = env::var_os("RUST_TARGET_PATH").unwrap_or(OsString::from_str(""));
- // FIXME 16351: add a sane default search path?
+ let paths = env::split_paths(&target_path)
+ let paths = os::split_paths(target_path.to_str().unwrap()).into_iter()
+ .chain(Some(sysroot.join_many(&[env!("CFG_LIBDIR_RELATIVE"), "rustlib"])).into_iter());
- for dir in os::split_paths(target_path.to_str().unwrap()).iter() {
recipes/rust/files/0006-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From e4c200fb686c77eea4e99e86368d66362c05e202 Mon Sep 17 00:00:00 2001
From 591aa737a5c5ab9b488b7a3379c30ee46b717f28 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Tue, 18 Nov 2014 14:52:56 -0500
Subject: [PATCH 06/10] mk: for stage0, use RUSTFLAGS to override target libs
recipes/rust/files/0007-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 3a906749e88538aa4b5755603cdc0345da38dbe8 Mon Sep 17 00:00:00 2001
From eccd34cb82536c1a057a9486dbf2d03edd5ce777 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Tue, 18 Nov 2014 13:48:14 -0500
Subject: [PATCH 07/10] mk: add missing CFG_LIBDIR_RELATIVE
recipes/rust/files/0008-configure-support-bindir-and-extend-libdir-to-non-bl.patch
+9 -11
View File
@@ -1,4 +1,4 @@
From 5b549eb926d3bac9570a847774334548d1a5bd94 Mon Sep 17 00:00:00 2001
From 5ed89e6b244e9b41b4fc86652a64d086738c50b6 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 24 Nov 2014 13:10:15 -0500
Subject: [PATCH 08/10] configure: support --bindir, and extend libdir to
@@ -13,17 +13,17 @@ relative to sysroot, and allows libdir to end in an arbitrary directory
Note that this assumes absolute paths start with '/', which may break
windows platforms
---
configure | 49 +++++++++++++++++------
configure | 49 ++++++++++++++++-------
mk/host.mk | 6 ++-
mk/main.mk | 11 +++++
mk/main.mk | 11 ++++++
mk/perf.mk | 4 +-
mk/prepare.mk | 4 +-
src/librustc/metadata/filesearch.rs | 80 ++++++++++++++-----------------------
src/librustc/metadata/filesearch.rs | 78 ++++++++++++++-----------------------
src/librustc_trans/back/link.rs | 3 +-
7 files changed, 87 insertions(+), 70 deletions(-)
7 files changed, 86 insertions(+), 69 deletions(-)
diff --git a/configure b/configure
index e5333b4..cdd2b05 100755
index e722fe8..6674664 100755
--- a/configure
+++ b/configure
@@ -309,6 +309,31 @@ envopt() {
@@ -195,7 +195,7 @@ index f1c4aa6..37c0a1a 100644
prepare-base-$(1): PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
prepare-base-$(1): prepare-everything-$(1)
diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs
index a8d39f9..836bb6b 100644
index a8d39f9..c0f6189 100644
--- a/src/librustc/metadata/filesearch.rs
+++ b/src/librustc/metadata/filesearch.rs
@@ -68,8 +68,7 @@ impl<'a> FileSearch<'a> {
@@ -257,13 +257,11 @@ index a8d39f9..836bb6b 100644
pub fn get_or_default_sysroot() -> Path {
// Follow symlinks. If the resolved path is relative, make it absolute.
fn canonicalize(path: Option<Path>) -> Option<Path> {
@@ -195,8 +201,18 @@ pub fn get_or_default_sysroot() -> Path {
})
@@ -196,7 +202,17 @@ pub fn get_or_default_sysroot() -> Path {
}
- match canonicalize(os::self_exe_name()) {
match canonicalize(os::self_exe_name()) {
- Some(mut p) => { p.pop(); p.pop(); p }
+ match canonicalize(env::current_exe().ok()) {
+ Some(mut p) => {
+ // Remove the exe name
+ p.pop();
recipes/rust/files/0009-Parallelize-submake-invocations.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 0f5a6c9b8707ff81813e0dcf75370e05ebafddbf Mon Sep 17 00:00:00 2001
From 257bdad6c0252b5f57aa9c61da71afd47ddfb4af Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 24 Nov 2014 13:54:42 -0500
Subject: [PATCH 09/10] Parallelize submake invocations
recipes/rust/files/0010-std-thread_local-workaround-for-NULL-__dso_handle.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 52191bb8dd64d2ce70e0309198025f259658868b Mon Sep 17 00:00:00 2001
From 8bd76b2a28469de8ac95ff9e686820b47aee5d82 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Wed, 3 Dec 2014 19:15:19 -0500
Subject: [PATCH 10/10] std/thread_local: workaround for NULL __dso_handle