cargo: update

2015-06-29 11:21:26 -04:00
parent 6bcb69d4c0
commit 6e9bc43cb8
7 changed files with 79 additions and 45 deletions
@@ -1,6 +1,6 @@
-# 2015-05-21
-SRCREV_cargo = "3090cc3151389283ce5f733c66464c65f02aa659"
-SRCREV_rust-installer = "e54d4823d26cdb3f98e5a1b17e1c257cd329aa61"
+# 2015-06-29
+SRCREV_cargo = "339a103fa71701541229316a568fca12cf07fc8d"
+SRCREV_rust-installer = "8e4f8ea581502a2edc8177a040300e05ff7f91e3"

 require cargo.inc

@@ -14,21 +14,16 @@ 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 \
-	file://git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch;patchdir=../git2-rs \
-\
-\
-	git://github.com/alexcrichton/curl.git;protocol=https;destsuffix=curl-rust/curl-sys/curl;name=curl;branch=configure \
-	git://github.com/libgit2/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2 \
 "

-# 0.2.10  / -sys 0.1.22
-SRCREV_curl-rust = "00060b1be10cee2ef4ad4b6aa1f0bc34e85a3209"
+# 0.2.10  / -sys 0.1.24
+SRCREV_curl-rust = "9fbf39fa8765e777d110ad18a2a2a3ea42dcb717"

-# 0.2.7 / -sys 0.1.23
-SRCREV_ssh2-rs = "340827c475174007f0d122795456f82ebd3431fb"
+# 0.2.8 / -sys 0.1.25
+SRCREV_ssh2-rs = "afc39c6e7236b87d7ebde21ee4d4743d9437b85f"

 # 0.2.11 / -sys 0.2.14
-SRCREV_git2-rs = "d8f056e802cebbffabe032c7f96e52e76262a11b"
+SRCREV_git2-rs = "3a7a990607a766fa65a40b920d70c8289691d2f8"

 SRCREV_FORMAT .= "_curl-rust_curl_ssh2-rs_git2-rs"
 EXTRA_OECARGO_PATHS = "\
@@ -37,12 +32,20 @@ EXTRA_OECARGO_PATHS = "\
 	${WORKDIR}/git2-rs \
 "

-# FIXME: we don't actually use these, 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"
-SRCREV_libgit2 = "47f37400253210f483d84fb9c2ecf44fb5986849"
-
 CARGO_SNAPSHOT = "2015-04-02/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
 SRC_URI[md5sum] = "3d62194d02a9088cd8aae379e9498134"
 SRC_URI[sha256sum] = "16b6338ba2942989693984ba4dbd057c2801e8805e6da8fa7b781b00e722d117"
+
+# Used in libgit2-sys's build.rs, needed for pkg-config to be used
+export LIBSSH2_SYS_USE_PKG_CONFIG = "1"
+
+# FIXME: we don't actually use these, 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
+
+SRC_URI += "\
+	git://github.com/alexcrichton/curl.git;protocol=https;destsuffix=curl-rust/curl-sys/curl;name=curl;branch=configure \
+	git://github.com/libgit2/libgit2.git;protocol=https;destsuffix=git2-rs/libgit2-sys/libgit2;name=libgit2 \
+"
+SRCREV_curl = "9a300aa13e5035a795396e429aa861229424c9dc"
+SRCREV_libgit2 = "47f37400253210f483d84fb9c2ecf44fb5986849"
@@ -1,4 +1,4 @@
-From ed86311a8a67028bd8e529cfc2a5dd65d79e8f1d Mon Sep 17 00:00:00 2001
+From 797df37f3a9b377db475f3d2eae09fcbb90d2e4f 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
@@ -6,11 +6,11 @@ Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is

 ---
 curl-sys/Cargo.toml | 19 -------------------
- curl-sys/lib.rs     |  1 -
- 2 files changed, 20 deletions(-)
+ curl-sys/lib.rs     |  2 --
+ 2 files changed, 21 deletions(-)

 diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
-index 6631ae2..f384669 100644
+index 6e99e16..50d1101 100644
 --- a/curl-sys/Cargo.toml
 +++ b/curl-sys/Cargo.toml
@@ -18,23 +18,4 @@ path = "lib.rs"
@@ -38,17 +38,18 @@ index 6631ae2..f384669 100644
 -[target.x86_64-unknown-bitrig.dependencies]
 openssl-sys = "0.6.0"
 diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs
-index f3767ba..879c9a1 100644
+index 7cae355..a2d58ea 100644
 --- a/curl-sys/lib.rs
 +++ b/curl-sys/lib.rs
-@@ -2,7 +2,6 @@
+@@ -1,8 +1,6 @@
+ #![allow(non_camel_case_types, raw_pointer_derive)]
 
 extern crate libc;
- extern crate libz_sys;
+-#[cfg(not(target_env = "msvc"))] extern crate libz_sys;
 -#[cfg(unix)] extern crate openssl_sys;
 
 use libc::{c_void, c_int, c_char, c_uint, c_long};
 
 -- 
-2.4.1
+2.4.3

@@ -1,4 +1,4 @@
-From cfbd8d0b553e180d49e340eb63480292af2b0b9b Mon Sep 17 00:00:00 2001
+From 625b2491eca17e78fdec374f8e83ec00fcca5fc8 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] remove per-triple deps on openssl-sys
@@ -44,5 +44,5 @@ index 16b72c3..68235ae 100644
 
 name = "test"
 -- 
-2.4.1
+2.4.3

@@ -1,17 +1,17 @@
-From 4954d19a91f78d27574a2567b43f83cc91f3fd34 Mon Sep 17 00:00:00 2001
+From aa1bea8387b6108ca2cd60ad71e8d354d8790d62 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Mon, 10 Nov 2014 15:06:29 -0500
-Subject: [PATCH 1/3] Add generic openssl-sys dep
+Subject: [PATCH] Add generic openssl-sys dep

 ---
- libgit2-sys/Cargo.toml | 33 ++-------------------------------
- 1 file changed, 2 insertions(+), 31 deletions(-)
+ libgit2-sys/Cargo.toml | 36 ++----------------------------------
+ 1 file changed, 2 insertions(+), 34 deletions(-)

 diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml
-index c5e150f..e87cdd1 100644
+index 9c0aa6c..d95d07e 100644
 --- a/libgit2-sys/Cargo.toml
 +++ b/libgit2-sys/Cargo.toml
-@@ -16,37 +16,8 @@ description = "Native bindings to the libgit2 library"
+@@ -16,40 +16,8 @@ description = "Native bindings to the libgit2 library"
 [dependencies]
 libssh2-sys = "0.1.0"
 libc = "0.1"
@@ -51,6 +51,9 @@ index c5e150f..e87cdd1 100644
 -[target.x86_64-unknown-openbsd.dependencies]
 -openssl-sys = "0.6.0"
 -libz-sys = "0.1.0"
+-[target.x86_64-unknown-dragonfly.dependencies]
+-openssl-sys = "0.6.0"
+-libz-sys = "0.1.0"
 -- 
-2.4.1
+2.4.3

@@ -1,4 +1,4 @@
-From bbc72d2eb464b1296433b2c6ade7bc8e303912f7 Mon Sep 17 00:00:00 2001
+From a1ba6ce6f54e3b2b0c3e05043a015bc845d24025 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 26 May 2015 22:10:18 -0400
 Subject: [PATCH 2/3] libgit2-sys: avoid the build script, it is a disaster
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] libgit2-sys: avoid the build script, it is a disaster
 1 file changed, 3 insertions(+)

 diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs
-index dacd187..471ca69 100644
+index d624a63..9b8b98c 100644
 --- a/libgit2-sys/build.rs
 +++ b/libgit2-sys/build.rs
@@ -15,6 +15,9 @@ macro_rules! t {
@@ -22,5 +22,5 @@ index dacd187..471ca69 100644
     register_dep("OPENSSL");
 
 -- 
-2.4.1
+2.4.3

@@ -0,0 +1,25 @@
+From ce3e8e83be261ed7cf0a62dc8e66361588329ba2 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Tue, 26 May 2015 22:06:57 -0400
+Subject: [PATCH 3/3] bump libssh2 to fix build with nightly
+
+---
+ libgit2-sys/Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml
+index d95d07e..992ea7a 100644
+--- a/libgit2-sys/Cargo.toml
+++ b/libgit2-sys/Cargo.toml
+@@ -14,7 +14,7 @@ description = "Native bindings to the libgit2 library"
+   path = "lib.rs"
+ 
+ [dependencies]
+-libssh2-sys = "0.1.0"
+libssh2-sys = "0.1.23"
+ libc = "0.1"
+ openssl-sys = "0.6.0"
+ libz-sys = "0.1.0"
+-- 
+2.4.3
+
@@ -1,17 +1,17 @@
-From fbb1992f77853b16a59c32695aa24081bfd620a6 Mon Sep 17 00:00:00 2001
+From b45c6ed5524690603a1888dff21556b7f42db474 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 | 20 --------------------
- 1 file changed, 20 deletions(-)
+ libssh2-sys/Cargo.toml | 22 ----------------------
+ 1 file changed, 22 deletions(-)

 diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
-index a59dfec..fc65e32 100644
+index 501bba5..db8d21a 100644
 --- a/libssh2-sys/Cargo.toml
 +++ b/libssh2-sys/Cargo.toml
-@@ -15,26 +15,6 @@ path = "lib.rs"
+@@ -15,28 +15,6 @@ path = "lib.rs"
 [dependencies]
 libz-sys = "0.1.0"
 libc = "0.1"
@@ -35,9 +35,11 @@ index a59dfec..fc65e32 100644
 -[target.x86_64-unknown-dragonfly.dependencies]
 -openssl-sys = "0.6.0"
 -[target.x86_64-unknown-bitrig.dependencies]
+-openssl-sys = "0.6.0"
+-[target.x86_64-unknown-openbsd.dependencies]
 openssl-sys = "0.6.0"
 
 [build-dependencies]
 -- 
-2.4.1
+2.4.3