diff --git a/recipes/cargo/cargo_git.bb b/recipes/cargo/cargo_git.bb index 95b1b4e..90239e0 100644 --- a/recipes/cargo/cargo_git.bb +++ b/recipes/cargo/cargo_git.bb @@ -6,8 +6,7 @@ require cargo.inc SRC_URI += " \ git://github.com/carllerche/curl-rust.git;protocol=https;destsuffix=curl-rust;name=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 \ - file://curl-rust/0003-remove-per-triple-deps-on-openssl-sys.patch;patchdir=../curl-rust \ + file://curl-rust/0002-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 \ @@ -16,34 +15,25 @@ SRC_URI += " \ 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 \ \ -\ - git://github.com/sfackler/rust-openssl.git;protocol=https;name=rust-openssl;destsuffix=rust-openssl \ -\ \ git://github.com/alexcrichton/curl.git;protocol=https;destsuffix=curl-rust/curl-sys/curl;name=curl;branch=configure \ git://github.com/alexcrichton/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2;branch=libgit2-2014-12-19 \ " -# 0.1.17 -SRCREV_curl-rust = "b7089a71fba5757e36f8cb1b3767183d4b79c20f" +# 0.2.1 / -sys 0.1.14 +SRCREV_curl-rust = "e05dcfa59813f2d8c443afa3e37e26482e41091b" # 0.1.11 / -sys 0.1.8 -SRCREV_ssh2-rs = "c4c46c2d68dd207371c0565e2de2439bac583edc" +SRCREV_ssh2-rs = "bb0c71792799d7261ae6356a26aabd39c9e78430" -# 0.1.20 -SRCREV_git2-rs = "4f2757055ecb3c52346d7163e321eb9d510f94ba" +# 0.2.2 / -sys 0.2.1 +SRCREV_git2-rs = "8b52e3c86cec585038513116654d308f101e4582" -## This is only included to avoid cargo spuriously complaining about us having -## 2 versions of openssl-sys linked in -# 0.4.3 +2015-02-22 -SRCREV_rust-openssl = "ebd906293376ee8ed3b7ddafa4573d2a9222d8b7" - -SRCREV_FORMAT = "cargo_curl-rust_curl_ssh2-rs_git2-rs_rust-openssl" +SRCREV_FORMAT = "cargo_curl-rust_curl_ssh2-rs_git2-rs" EXTRA_OECARGO_PATHS = "\ ${WORKDIR}/curl-rust \ ${WORKDIR}/ssh2-rs \ ${WORKDIR}/git2-rs \ - ${WORKDIR}/rust-openssl \ " # FIXME: we don't actually use these, and shouldn't need to fetch it, but not having it results in: diff --git a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch b/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch index 0ff0303..c10f5ec 100644 --- a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch +++ b/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch @@ -1,40 +1,40 @@ -From 979f3ed5cff5356b67d8bbf946d51b0132272c87 Mon Sep 17 00:00:00 2001 +From 47f506d98444c84f232aefb029c2ec48b7027b8c Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 25 Nov 2014 11:50:28 -0500 -Subject: [PATCH 1/3] curl-sys: avoid explicitly linking in openssl. If it is +Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is needed, pkgconfig will pull it in --- - curl-sys/Cargo.toml | 18 ------------------ + curl-sys/Cargo.toml | 17 ----------------- curl-sys/lib.rs | 1 - - 2 files changed, 19 deletions(-) + 2 files changed, 18 deletions(-) diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml -index dfd001f..3b58919 100644 +index 5c380ca..cfea848 100644 --- a/curl-sys/Cargo.toml +++ b/curl-sys/Cargo.toml -@@ -18,21 +18,3 @@ path = "lib.rs" +@@ -18,21 +18,4 @@ 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.4.0" +-openssl-sys = "0.5.0" -[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.4.0" + openssl-sys = "0.5.0" diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs index 0a224a4..1328834 100644 --- a/curl-sys/lib.rs @@ -48,5 +48,5 @@ index 0a224a4..1328834 100644 use libc::{c_void, c_int, c_char, c_uint, c_long}; -- -2.3.0 +2.3.1 diff --git a/recipes/cargo/files/curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch b/recipes/cargo/files/curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch deleted file mode 100644 index 0a91457..0000000 --- a/recipes/cargo/files/curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8e66b372f0e2ac5818ec5de14324451fc2357234 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Tue, 25 Nov 2014 12:26:48 -0500 -Subject: [PATCH 2/3] openssl-sys is used in curl-rust, so include it - explicitly here - ---- - Cargo.toml | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Cargo.toml b/Cargo.toml -index c813796..9fd56f5 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -15,6 +15,9 @@ libc = "0.1" - path = "curl-sys" - version = "0.1.0" - -+[dependencies.openssl-sys] -+version = "*" -+ - [dev-dependencies] - log = "0.2" - --- -2.3.0 - diff --git a/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch b/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch new file mode 100644 index 0000000..bfc8b78 --- /dev/null +++ b/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch @@ -0,0 +1,46 @@ +From 10407529857b8bb5bb38036fab1e5029627b902d Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Tue, 25 Nov 2014 12:26:48 -0500 +Subject: [PATCH 2/2] remove per-triple deps on openssl-sys + +--- + Cargo.toml | 19 +------------------ + 1 file changed, 1 insertion(+), 18 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 2fc9d87..17cf9f3 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,6 +10,7 @@ description = "Rust bindings to libcurl for making HTTP requests" + [dependencies] + url = "0.2.0" + libc = "0.1" ++openssl-sys = "0.5.0" + + [dependencies.curl-sys] + path = "curl-sys" +@@ -17,21 +18,3 @@ version = "0.1.0" + + [dev-dependencies] + log = "0.2" +- +-# Unix platforms use OpenSSL for now to provide SSL functionality +-[target.i686-apple-darwin.dependencies] +-openssl-sys = "0.5.0" +-[target.x86_64-apple-darwin.dependencies] +-openssl-sys = "0.5.0" +-[target.i686-unknown-linux-gnu.dependencies] +-openssl-sys = "0.5.0" +-[target.x86_64-unknown-linux-gnu.dependencies] +-openssl-sys = "0.5.0" +-[target.arm-unknown-linux-gnueabihf.dependencies] +-openssl-sys = "0.5.0" +-[target.aarch64-unknown-linux-gnu.dependencies] +-openssl-sys = "0.5.0" +-[target.i686-unknown-freebsd.dependencies] +-openssl-sys = "0.5.0" +-[target.x86_64-unknown-freebsd.dependencies] +-openssl-sys = "0.5.0" +-- +2.3.1 + diff --git a/recipes/cargo/files/curl-rust/0003-remove-per-triple-deps-on-openssl-sys.patch b/recipes/cargo/files/curl-rust/0003-remove-per-triple-deps-on-openssl-sys.patch deleted file mode 100644 index 99fc717..0000000 --- a/recipes/cargo/files/curl-rust/0003-remove-per-triple-deps-on-openssl-sys.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0214ac430f8dcd31ef4dbb88540da3c805d4ccf6 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Fri, 13 Feb 2015 13:34:11 -0500 -Subject: [PATCH 3/3] remove per-triple deps on openssl-sys - ---- - Cargo.toml | 48 ++++++++++++++---------------------------------- - 1 file changed, 14 insertions(+), 34 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 9fd56f5..3b58919 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -1,40 +1,20 @@ - [package] -- --name = "curl" --version = "0.1.17" --authors = ["Carl Lerche "] -+name = "curl-sys" -+version = "0.1.10" -+authors = ["Carl Lerche Date: Mon, 10 Nov 2014 15:06:29 -0500 Subject: [PATCH] Add generic openssl-sys dep --- - libgit2-sys/Cargo.toml | 26 +------------------------- - 1 file changed, 1 insertion(+), 25 deletions(-) + libgit2-sys/Cargo.toml | 27 ++------------------------- + 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml -index d4e36ee..0e08422 100644 +index 41b6bcb..8018d8f 100644 --- a/libgit2-sys/Cargo.toml +++ b/libgit2-sys/Cargo.toml -@@ -15,31 +15,7 @@ description = "Native bindings to the libgit2 library" - +@@ -16,31 +16,8 @@ description = "Native bindings to the libgit2 library" [dependencies] libssh2-sys = "0.1.0" -+openssl-sys = "*" + libc = "0.1" ++openssl-sys = "0.5.0" ++libz-sys = "0.1.0" [build-dependencies] - pkg-config = "0.2" + pkg-config = "0.3" - -[target.i686-apple-darwin.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -libz-sys = "0.1.0" -- -2.3.0 +2.3.1 diff --git a/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch b/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch index 8e86ea1..e15e421 100644 --- a/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch +++ b/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch @@ -1,14 +1,14 @@ -From 7e7a5527024dbc0e45c1d4b284466a499c9580fe Mon Sep 17 00:00:00 2001 +From 9abdf2a4f8acdc432e83f62d7ac7d0e2eb57bc2e Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 1 Dec 2014 10:51:31 -0500 -Subject: [PATCH 1/2] Unconditionally depend on openssl-sys +Subject: [PATCH] Unconditionally depend on openssl-sys --- libssh2-sys/Cargo.toml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml -index a91df02..e58515a 100644 +index e22f03f..9cd10ee 100644 --- a/libssh2-sys/Cargo.toml +++ b/libssh2-sys/Cargo.toml @@ -15,24 +15,6 @@ path = "lib.rs" @@ -17,25 +17,25 @@ index a91df02..e58515a 100644 libc = "0.1" - -[target.i686-apple-darwin.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.4.0" +-openssl-sys = "0.5.0" -[target.x86_64-unknown-dragonfly.dependencies] - openssl-sys = "0.4.0" + openssl-sys = "0.5.0" [build-dependencies] -- -2.3.0 +2.3.1