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

more rust

Browse Source
This commit is contained in:
Cody P Schafer
2015-02-17 10:50:02 -05:00
parent 4b6b493959
commit 18aa5bd379
17 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/cargo/cargo.inc
+1 -1
View File
@@ -8,7 +8,7 @@ HOMEPAGE = "http://crates.io"
SECTION = "devel"
LICENSE = "MIT | Apache-2.0"
DEPENDS = "openssl zlib libgit2 curl ca-certificates"
DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2"
SRC_URI = "git://github.com/rust-lang/cargo.git;protocol=https;name=cargo"
recipes/cargo/cargo_git.bb
+18 -2
View File
@@ -4,21 +4,37 @@ SRCREV_cargo = "0b84923203dce67ff8cf051728b6908c9c2e303c"
require cargo.inc
SRC_URI += " \
git://github.com/carllerche/curl-rust.git;protocol=https;name=curl-rust;destsuffix=curl-rust \
file:///0001-update-Rust.patch \
\
git://github.com/carllerche/curl-rust.git;protocol=https;destsuffix=curl-rust;name=curl-rust \
git://github.com/alexcrichton/curl.git;protocol=https;destsuffix=curl-rust/curl-sys/curl;name=curl;branch=configure \
file://curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch;patchdir=../curl-rust \
file://curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch;patchdir=../curl-rust \
file://curl-rust/0003-remove-per-triple-deps-on-openssl-sys.patch;patchdir=../curl-rust \
\
git://github.com/alexcrichton/ssh2-rs.git;protocol=https;name=ssh2-rs;destsuffix=ssh2-rs \
file://ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch;patchdir=../ssh2-rs \
file://ssh2-rs/0002-libssh2-sys-only-support-pkg-config.patch;patchdir=../ssh2-rs \
\
git://github.com/alexcrichton/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \
file://git2-rs/0001-Add-generic-openssl-sys-dep.patch;patchdir=../git2-rs \
"
SRCREV_git2-rs = "d0d21ca14b4a410806b577b04c2d29f7f8e45f61"
# 0.1.14
SRCREV_curl-rust = "9181ea8f4ea2c7eb60224b5ebf464751165e2881"
# FIXME: we don't actually use this, and shouldn't need to fetch it, but not having it results in:
## target/snapshot/bin/cargo build --target x86_64-linux --verbose
## Failed to resolve path '/home/cody/obj/y/tmp/work/x86_64-linux/cargo-native/git+gitAUTOINC+0b84923203_9181ea8f4e_8baa8ccb39-r0/curl-rust/curl-sys/curl/.git': No such file or directory
SRCREV_curl = "ac30e9a7746c8641f4871e59b831ec28530c5c73"
# libssh2-sys 0.1.5 +2015-2-10
SRCREV_ssh2-rs = "8baa8ccb39cd1a43362d2a1ee87d8c3b91496cd7"
SRCREV_FORMAT = "cargo_curl-rust_ssh2-rs"
SRCREV_FORMAT = "cargo_curl-rust_curl_ssh2-rs_git2-rs"
EXTRA_OECARGO_PATHS = "\
${WORKDIR}/curl-rust \
${WORKDIR}/ssh2-rs \
${WORKDIR}/git2-rs \
"
recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch
+18 -16
View File
@@ -1,40 +1,42 @@
From 618d1fc99f418068f3e40c6bc135811faa589bd5 Mon Sep 17 00:00:00 2001
From f975a2796178c840d54cb1070cabf84b79829388 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
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/3] curl-sys: avoid explicitly linking in openssl. If it is
needed, pkgconfig will pull it in
---
curl-sys/Cargo.toml | 16 ----------------
curl-sys/Cargo.toml | 18 ------------------
curl-sys/lib.rs | 1 -
2 files changed, 17 deletions(-)
2 files changed, 19 deletions(-)
diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
index 0594b3f..dbf255e 100644
index 13c8425..6b0c22a 100644
--- a/curl-sys/Cargo.toml
+++ b/curl-sys/Cargo.toml
@@ -17,19 +17,3 @@ path = "lib.rs"
@@ -18,21 +18,3 @@ path = "lib.rs"
[dependencies]
libz-sys = "0.1.0"
libc = "0.1"
-
-# Unix platforms use OpenSSL for now to provide SSL functionality
-[target.i686-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.x86_64-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.i686-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.arm-unknown-linux-gnueabihf.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.aarch64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.3.0"
-[target.i686-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.x86_64-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs
index 5c097ed..c6c1d29 100644
index ea21503..99dab99 100644
--- a/curl-sys/lib.rs
+++ b/curl-sys/lib.rs
@@ -3,7 +3,6 @@
@@ -46,5 +48,5 @@ index 5c097ed..c6c1d29 100644
use libc::{c_void, c_int, c_char, c_uint, c_long};
--
2.2.1
2.3.0
recipes/cargo/files/curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch
+7 -6
View File
@@ -1,7 +1,7 @@
From 74aa790a89a3b15acd6692180d854745e6d967d9 Mon Sep 17 00:00:00 2001
From 09e25bc8799eb05d7fade240d6a12d9b7642046a Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Tue, 25 Nov 2014 12:26:48 -0500
Subject: [PATCH 2/2] openssl-sys is used in curl-rust, so include it
Subject: [PATCH 2/3] openssl-sys is used in curl-rust, so include it
explicitly here
---
@@ -9,10 +9,10 @@ Subject: [PATCH 2/2] openssl-sys is used in curl-rust, so include it
1 file changed, 3 insertions(+)
diff --git a/Cargo.toml b/Cargo.toml
index a308b4b..e566b9d 100644
index f9671e4..c845da1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,5 +14,8 @@ url = "0.2.0"
@@ -15,6 +15,9 @@ libc = "0.1"
path = "curl-sys"
version = "0.1.0"
@@ -20,7 +20,8 @@ index a308b4b..e566b9d 100644
+version = "*"
+
[dev-dependencies]
log = "0.1.0"
log = "0.2"
--
2.2.1
2.3.0
recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch
+17 -15
View File
@@ -1,39 +1,41 @@
From fc9101ce66e93118dfbdf9897715e2c09f5c7abc Mon Sep 17 00:00:00 2001
From a5542bbf95e6d8f9f994439e652defddf5b91984 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 1 Dec 2014 10:51:31 -0500
Subject: [PATCH] Unconditionally depend on openssl-sys
Subject: [PATCH 1/2] Unconditionally depend on openssl-sys
---
libssh2-sys/Cargo.toml | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
libssh2-sys/Cargo.toml | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
index e03f1db..515abb4 100644
index fe5d039..914d72a 100644
--- a/libssh2-sys/Cargo.toml
+++ b/libssh2-sys/Cargo.toml
@@ -14,21 +14,7 @@ path = "lib.rs"
@@ -14,24 +14,6 @@ path = "lib.rs"
[dependencies]
libz-sys = "0.1.0"
-
-[target.i686-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.x86_64-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.i686-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.3.0"
-[target.aarch64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-[target.arm-unknown-linux-gnueabihf.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.i686-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
-openssl-sys = "0.3.0"
-[target.x86_64-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
+openssl-sys = "*"
-openssl-sys = "0.3.0"
-[target.x86_64-unknown-dragonfly.dependencies]
openssl-sys = "0.3.0"
[build-dependencies]
pkg-config = "0.1.0"
--
2.2.1
2.3.0
recipes/rust/files/0001-libstd-io-process-Command-fully-quote-and-escape-the.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From 3355850b0f387355e83bbdcdbbab7850c898d711 Mon Sep 17 00:00:00 2001
From 9c7368781c5ea57ee6dadd5e985f12a76fe74dc4 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/11] 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 b1761599f03139070a3354ec2b6f2f25db27bac8 Mon Sep 17 00:00:00 2001
From cc9dd9db3f96de835226c955d0ed979c68f85841 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/11] 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 d17171eeca05291a8652fd61c7ae4463013bd39f Mon Sep 17 00:00:00 2001
From d4ce12b74f22143bfbd8060809cfdd3617cbee44 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/11] 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 497fb616163eabd5ed8a08ec0fc22ed75091c38d Mon Sep 17 00:00:00 2001
From e48a1c3c2901d12f4870f897c940eb1bfb322053 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/11] mk/rt/compiler_rt: pass LDFLAGS from
recipes/rust/files/0005-Target-add-default-target.json-path-libdir-rust-targ.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From 8430a9b57867be21a070182c305329fba1dcb85b Mon Sep 17 00:00:00 2001
From a598b496c1298b5a861a8cf7ce0d1ff14dc6dc64 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/11] Target: add default target.json path:
@@ -11,7 +11,7 @@ Subject: [PATCH 05/11] Target: add default target.json path:
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index cd664b7..51537bd 100644
index 8340a49..2219b3c 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -633,12 +633,12 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
@@ -56,7 +56,7 @@ index bd44dbe..cb7b709 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 afb5c94..c27afcb 100644
index 4d90c49..ba8bf1e 100644
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -302,12 +302,13 @@ impl Target {
@@ -75,7 +75,7 @@ index afb5c94..c27afcb 100644
fn load_file(path: &Path) -> Result<Target, String> {
let mut f = try!(File::open(path).map_err(|e| format!("{:?}", e)));
@@ -387,9 +388,11 @@ impl Target {
let target_path = env::var("RUST_TARGET_PATH")
let target_path = env::var_os("RUST_TARGET_PATH")
.unwrap_or(OsString::from_str(""));
- // FIXME 16351: add a sane default search path?
recipes/rust/files/0006-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From baca81cff977cb7a2a9291b06ca45e2ab6305da5 Mon Sep 17 00:00:00 2001
From 213c2b7d572eb399756de786b531c6d45d683416 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/11] 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 67e86a885f0361f7e69476d017337df56cfa6fc7 Mon Sep 17 00:00:00 2001
From ab3ace1fda3abb216d538b86b4110cd4a25e3b4f 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/11] mk: add missing CFG_LIBDIR_RELATIVE
recipes/rust/files/0008-configure-support-bindir-and-extend-libdir-to-non-bl.patch
+7 -7
View File
@@ -1,4 +1,4 @@
From c8c79e972cdc2529acbdf5403feda71666f30e60 Mon Sep 17 00:00:00 2001
From 9b5ca76506f84c1e8df5da39255d050969f225ec 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/11] configure: support --bindir, and extend libdir to
@@ -24,7 +24,7 @@ windows platforms
8 files changed, 87 insertions(+), 70 deletions(-)
diff --git a/configure b/configure
index a80dafc..e0efaf2 100755
index e6b8d23..1216964 100755
--- a/configure
+++ b/configure
@@ -309,6 +309,31 @@ envopt() {
@@ -59,7 +59,7 @@ index a80dafc..e0efaf2 100755
to_llvm_triple() {
case $1 in
i686-w64-mingw32) echo i686-pc-windows-gnu ;;
@@ -561,23 +586,15 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
@@ -562,23 +587,15 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
if [ "$CFG_OSTYPE" = "pc-windows-gnu" ]
then
CFG_LIBDIR_RELATIVE=bin
@@ -88,7 +88,7 @@ index a80dafc..e0efaf2 100755
fi
if [ $HELP -eq 1 ]
@@ -586,6 +603,11 @@ then
@@ -587,6 +604,11 @@ then
exit 0
fi
@@ -100,7 +100,7 @@ index a80dafc..e0efaf2 100755
# Validate Options
step_msg "validating $CFG_SELF args"
validate_opt
@@ -1342,6 +1364,7 @@ putvar CFG_PREFIX
@@ -1343,6 +1365,7 @@ putvar CFG_PREFIX
putvar CFG_HOST
putvar CFG_TARGET
putvar CFG_LIBDIR_RELATIVE
@@ -196,7 +196,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 1b2d82e..0405d67 100644
index 3caa0f5..39dafa2 100644
--- a/src/librustc/metadata/filesearch.rs
+++ b/src/librustc/metadata/filesearch.rs
@@ -67,8 +67,7 @@ impl<'a> FileSearch<'a> {
@@ -327,7 +327,7 @@ index 1b2d82e..0405d67 100644
// The name of rustc's own place to organize libraries.
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 51537bd..54d995c 100644
index 2219b3c..20f2762 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -633,7 +633,7 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
recipes/rust/files/0009-Parallelize-submake-invocations.patch
+1 -1
View File
@@ -1,4 +1,4 @@
From f8ec11a7e7420d740b41179976c44163f4a6c5f4 Mon Sep 17 00:00:00 2001
From 58cfcc79553014c3c335885f2bd141b1e564f9fb 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/11] Parallelize submake invocations
recipes/rust/files/0010-std-thread_local-workaround-for-NULL-__dso_handle.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 5372227d27491a4b468867bd235c83859ff64475 Mon Sep 17 00:00:00 2001
From d380a3383a12e59b8534d4d70c31e4c759fc3843 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/11] std/thread_local: workaround for NULL __dso_handle
@@ -8,10 +8,10 @@ Subject: [PATCH 10/11] std/thread_local: workaround for NULL __dso_handle
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs
index 9de5fd1..273f45c 100644
index eab9cd8..cc5cefc 100644
--- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs
@@ -393,7 +393,7 @@ mod imp {
@@ -397,7 +397,7 @@ mod imp {
#[linkage = "extern_weak"]
static __cxa_thread_atexit_impl: *const ();
}
recipes/rust/files/0011-librustc_back-target-rename-json-field-from-target-w.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 937d33a68d367bd67060b8a57082324ef7589878 Mon Sep 17 00:00:00 2001
From 59b74e4f745a979d57eaa78c30f3e6777f4d0eba Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Thu, 12 Feb 2015 10:29:21 -0500
Subject: [PATCH 11/11] librustc_back/target: rename json field from
@@ -18,7 +18,7 @@ potentially a:
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 54d995c..b6d901c 100644
index 20f2762..62dd732 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -645,7 +645,7 @@ pub fn build_target_config(sysroot: &Path, opts: &Options, sp: &SpanHandler) ->
@@ -31,7 +31,7 @@ index 54d995c..b6d901c 100644
Config {
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index c27afcb..0fad037 100644
index ba8bf1e..cc89356 100644
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -40,7 +40,7 @@
recipes/rust/rust_git.bb
+2 -2
View File
@@ -1,5 +1,5 @@
# 2014-02-10
SRCREV = "88d8ba5ab3b1d22288b021708c3d87464e43b880"
# 2014-02-12
SRCREV = "cf636c233dfeef5abf0de8fb35e23c0a161810d2"
require rust-git.inc
SRC_URI_append = "\