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

cargo: update

Browse Source
This commit is contained in:
Cody P Schafer
2014-12-29 11:06:59 -05:00
parent 0acbffda6e
commit 52e70f3355
5 changed files with 60 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/cargo/cargo_git.bb
+3 -5
View File
@@ -1,9 +1,7 @@
SRCREV_cargo = "0f6667ca0631fe72d1e15759c845f0197e3dfe19"
SRCREV_cargo = "e6abfbb959b363248ee03c731a67d2897dd061ce"
require cargo.inc
SRC_URI += " \
file://0001-custom_build-build-output-goes-in-the-directory-for-.patch \
\
git://github.com/carllerche/curl-rust.git;protocol=https;name=curl-rust;destsuffix=curl-rust \
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 \
@@ -12,8 +10,8 @@ SRC_URI += " \
file://ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch;patchdir=../ssh2-rs \
"
SRCREV_curl-rust = "6f007b4967ec12e36937dcb081abe0bdb3bcc508"
SRCREV_ssh2-rs = "982dc47a45a5a2d66ea092ee6bb9503ddcbf36d9"
SRCREV_curl-rust = "6f4d66ed0bc5e71a0ea86a37f038f7c9f73dc3ae"
SRCREV_ssh2-rs = "509a8459e466ffa4705a0c686b80ac80b499f5d5"
SRCREV_FORMAT = "cargo_curl-rust_ssh2-rs"
EXTRA_OECARGO_PATHS = "\
${WORKDIR}/curl-rust \
recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch
+21 -21
View File
@@ -1,4 +1,4 @@
From 56ce13c48b28b85071e234317cc90371bac1fd48 Mon Sep 17 00:00:00 2001
From 618d1fc99f418068f3e40c6bc135811faa589bd5 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
@@ -10,31 +10,31 @@ Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is
2 files changed, 17 deletions(-)
diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
index d166ae9..80a320f 100644
index 0594b3f..dbf255e 100644
--- a/curl-sys/Cargo.toml
+++ b/curl-sys/Cargo.toml
@@ -14,19 +14,3 @@ path = "lib.rs"
@@ -17,19 +17,3 @@ path = "lib.rs"
[dependencies.libz-sys]
git = "https://github.com/alexcrichton/libz-sys"
[dependencies]
libz-sys = "0.1.0"
-
-# Unix platforms use OpenSSL for now to provide SSL functionality
-[target.i686-apple-darwin.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.x86_64-apple-darwin.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.i686-unknown-linux-gnu.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.x86_64-unknown-linux-gnu.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.arm-unknown-linux-gnueabihf.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.i686-unknown-freebsd.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.x86_64-unknown-freebsd.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.i686-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-[target.x86_64-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-[target.i686-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-[target.arm-unknown-linux-gnueabihf.dependencies]
-openssl-sys = "0.2.0"
-[target.i686-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
-[target.x86_64-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs
index bbfb12c..9cfbb23 100644
index 5c097ed..c6c1d29 100644
--- a/curl-sys/lib.rs
+++ b/curl-sys/lib.rs
@@ -3,7 +3,6 @@
@@ -46,5 +46,5 @@ index bbfb12c..9cfbb23 100644
use libc::{c_void, c_int, c_char, c_uint, c_long};
--
2.1.3
2.2.1
recipes/cargo/files/curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch
+10 -8
View File
@@ -1,4 +1,4 @@
From d71d6fa0b9be06cd84eb6c8f7411c624725431c4 Mon Sep 17 00:00:00 2001
From 74aa790a89a3b15acd6692180d854745e6d967d9 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
@@ -9,16 +9,18 @@ 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 ba6e748..9e25cd1 100644
index a308b4b..e566b9d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,3 +10,6 @@ git = "https://github.com/servo/rust-url"
[dependencies.curl-sys]
@@ -14,5 +14,8 @@ url = "0.2.0"
path = "curl-sys"
version = "*"
+
version = "0.1.0"
+[dependencies.openssl-sys]
+git = "https://github.com/sfackler/rust-openssl"
+version = "*"
+
[dev-dependencies]
log = "0.1.0"
--
2.1.3
2.2.1
recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch
+26 -26
View File
@@ -1,39 +1,39 @@
From 95e10eb73f61a3aef83fb387f22ea6c33732bc8d Mon Sep 17 00:00:00 2001
From fc9101ce66e93118dfbdf9897715e2c09f5c7abc 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
---
libssh2-sys/Cargo.toml | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
libssh2-sys/Cargo.toml | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
index 74fa893..c3fa4db 100644
index e03f1db..515abb4 100644
--- a/libssh2-sys/Cargo.toml
+++ b/libssh2-sys/Cargo.toml
@@ -12,20 +12,8 @@ path = "lib.rs"
[dependencies.libz-sys]
git = "https://github.com/alexcrichton/libz-sys"
@@ -14,21 +14,7 @@ path = "lib.rs"
-[target.i686-apple-darwin.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.x86_64-apple-darwin.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.i686-unknown-linux-gnu.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.x86_64-unknown-linux-gnu.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.arm-unknown-linux-gnueabihf.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.i686-unknown-freebsd.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
-[target.x86_64-unknown-freebsd.dependencies.openssl-sys]
- git = "https://github.com/sfackler/rust-openssl"
+[dependencies.openssl-sys]
+ git = "https://github.com/sfackler/rust-openssl"
[dependencies]
libz-sys = "0.1.0"
-
-[target.i686-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-[target.x86_64-apple-darwin.dependencies]
-openssl-sys = "0.2.0"
-[target.i686-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.2.0"
-[target.arm-unknown-linux-gnueabihf.dependencies]
-openssl-sys = "0.2.0"
-[target.i686-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
-[target.x86_64-unknown-freebsd.dependencies]
-openssl-sys = "0.2.0"
+openssl-sys = "*"
[build-dependencies.pkg-config]
git = "https://github.com/alexcrichton/pkg-config-rs"
[build-dependencies]
pkg-config = "0.1.0"
--
2.1.3
2.2.1
recipes/cargo/files/ssh2-rs/0001-Update-to-namespaced-io-FileType.patch
-49
View File
@@ -1,49 +0,0 @@
From 29fcce9f8147ff9644666824ce9f7739f4aa9ea8 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Sat, 29 Nov 2014 13:38:57 -0800
Subject: [PATCH] Update to namespaced io::FileType
---
libssh2-sys/build.rs | 2 +-
src/session.rs | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
index 4886782..c68643f 100644
--- a/libssh2-sys/build.rs
+++ b/libssh2-sys/build.rs
@@ -90,7 +90,7 @@ fn main() {
let root = root.join("include");
let dst = dst.join("include");
for file in fs::walk_dir(&root).unwrap() {
- if fs::stat(&file).unwrap().kind != io::TypeFile { continue }
+ if fs::stat(&file).unwrap().kind != io::FileType::RegularFile { continue }
let part = file.path_relative_from(&root).unwrap();
let dst = dst.join(part);
diff --git a/src/session.rs b/src/session.rs
index 0fcee0c..c22d8e6 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -588,12 +588,12 @@ fn mkstat(stat: &libc::stat) -> io::FileStat {
io::FileStat {
size: stat.st_size as u64,
kind: match (stat.st_mode as Mode) & libc::S_IFMT {
- libc::S_IFREG => io::TypeFile,
- libc::S_IFDIR => io::TypeDirectory,
- libc::S_IFIFO => io::TypeNamedPipe,
- libc::S_IFBLK => io::TypeBlockSpecial,
- libc::S_IFLNK => io::TypeSymlink,
- _ => io::TypeUnknown,
+ libc::S_IFREG => io::FileType::RegularFile,
+ libc::S_IFDIR => io::FileType::Directory,
+ libc::S_IFIFO => io::FileType::NamedPipe,
+ libc::S_IFBLK => io::FileType::BlockSpecial,
+ libc::S_IFLNK => io::FileType::Symlink,
+ _ => io::FileType::Unknown,
},
perm: io::FilePermission::from_bits_truncate(stat.st_mode as u32),
created: mktime(stat.st_ctime as u64, stat.st_ctime_nsec as u64),
--
2.0.4