diff --git a/recipes/cargo/cargo-snapshot-2015-04-02.inc b/recipes/cargo/cargo-snapshot-2015-04-02.inc new file mode 100644 index 0000000..c81fa79 --- /dev/null +++ b/recipes/cargo/cargo-snapshot-2015-04-02.inc @@ -0,0 +1,4 @@ + +CARGO_SNAPSHOT = "2015-04-02/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" +SRC_URI[md5sum] = "3d62194d02a9088cd8aae379e9498134" +SRC_URI[sha256sum] = "16b6338ba2942989693984ba4dbd057c2801e8805e6da8fa7b781b00e722d117" diff --git a/recipes/cargo/cargo.inc b/recipes/cargo/cargo.inc index 237fb8f..bc38345 100644 --- a/recipes/cargo/cargo.inc +++ b/recipes/cargo/cargo.inc @@ -12,20 +12,9 @@ LICENSE = "MIT | Apache-2.0" DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2" SRC_URI = "\ - git://github.com/rust-lang/cargo.git;protocol=https;name=cargo \ - git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=git/src/rust-installer \ http://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${CARGO_SNAPSHOT} \ " -LIC_FILES_CHKSUM ="\ - file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \ - file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ - file://LICENSE-THIRD-PARTY;md5=afbb7ae0aa70c8e437a007314eae5f3b \ -" -SRCREV_FORMAT = "cargo_rust-installer" -PV .= "+git${SRCPV}" - -S = "${WORKDIR}/git" B = "${S}" PACKAGECONFIG ??= "" @@ -34,6 +23,9 @@ PACKAGECONFIG ??= "" # & rust's use of cooked triples PACKAGECONFIG[rust-snapshot] = "--local-rust-root=${B}/rustc" +# Used in libgit2-sys's build.rs, needed for pkg-config to be used +export LIBGIT2_SYS_USE_PKG_CONFIG = "1" + do_configure () { ${@bb.utils.contains('PACKAGECONFIG', 'rust-snapshot', '${S}/.travis.install.deps.sh', ':', d)} diff --git a/recipes/cargo/cargo_0.7.0.bb b/recipes/cargo/cargo_0.7.0.bb new file mode 100644 index 0000000..1fccc96 --- /dev/null +++ b/recipes/cargo/cargo_0.7.0.bb @@ -0,0 +1,56 @@ +require cargo-snapshot-2015-04-02.inc +require cargo.inc + +SRC_URI += " \ + https://github.com/rust-lang/cargo/archive/${PV}.tar.gz;name=cargo \ + git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=${BP}/src/rust-installer \ +" +SRC_URI[cargo.md5sum] = "2089790a4a48de7f8f3cb1afcfa9ec74" +SRC_URI[cargo.sha256sum] = "b1067d710e64b66a197294df2fa3dd4fb1d645171eaa517b93d42678bb687338" + +SRCREV_rust-installer = "c37d3747da75c280237dc2d6b925078e69555499" + +S = "${WORKDIR}/${BP}" + +LIC_FILES_CHKSUM ="\ + file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \ + file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ + file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \ +" + +## curl-rust +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.patch;patchdir=../curl-rust \ + file://curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch;patchdir=../curl-rust \ +" + +# 0.2.14 / -sys 0.1.29 +SRCREV_curl-rust = "76172b3ebf958fcf0b10d400f19ee02486a80ee7" + +SRCREV_FORMAT .= "_curl-rust" +EXTRA_OECARGO_PATHS += "${WORKDIR}/curl-rust" + +## ssh2-rs +SRC_URI += "\ + git://github.com/alexcrichton/ssh2-rs.git;protocol=https;name=ssh2-rs;destsuffix=ssh2-rs \ + file://ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch;patchdir=../ssh2-rs \ +" + +# 0.2.10 / -sys 0.1.34 +SRCREV_ssh2-rs = "00af6ead0c3d4b82e05bee4d9963ef3823bcf524" + +SRCREV_FORMAT .= "_ssh2-rs" +EXTRA_OECARGO_PATHS += "${WORKDIR}/ssh2-rs" + +## git2-rs +SRC_URI += "\ + git://github.com/alexcrichton/git2-rs.git;protocol=https;name=git2-rs;destsuffix=git2-rs \ + file://git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch;patchdir=../git2-rs \ +" + +# 0.3.3 / -sys 0.3.8 +SRCREV_git2-rs = "19b6873c1fad7dc93c9c2dac4cba339dacf16efa" + +SRCREV_FORMAT .= "_git2-rs" +EXTRA_OECARGO_PATHS += "${WORKDIR}/git2-rs" diff --git a/recipes/cargo/cargo_git.bb b/recipes/cargo/cargo_git.bb deleted file mode 100644 index 70fa809..0000000 --- a/recipes/cargo/cargo_git.bb +++ /dev/null @@ -1,51 +0,0 @@ -# 2015-06-29 -SRCREV_cargo = "339a103fa71701541229316a568fca12cf07fc8d" -SRCREV_rust-installer = "8e4f8ea581502a2edc8177a040300e05ff7f91e3" - -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-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 \ -\ - 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 \ -" - -# 0.2.10 / -sys 0.1.24 -SRCREV_curl-rust = "9fbf39fa8765e777d110ad18a2a2a3ea42dcb717" - -# 0.2.8 / -sys 0.1.25 -SRCREV_ssh2-rs = "afc39c6e7236b87d7ebde21ee4d4743d9437b85f" - -# 0.2.11 / -sys 0.2.14 -SRCREV_git2-rs = "3a7a990607a766fa65a40b920d70c8289691d2f8" - -SRCREV_FORMAT .= "_curl-rust_curl_ssh2-rs_git2-rs" -EXTRA_OECARGO_PATHS = "\ - ${WORKDIR}/curl-rust \ - ${WORKDIR}/ssh2-rs \ - ${WORKDIR}/git2-rs \ -" - -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 LIBGIT2_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" diff --git a/recipes/cargo/files/0001-update-Rust.patch b/recipes/cargo/files/0001-update-Rust.patch deleted file mode 100644 index 6f963a5..0000000 --- a/recipes/cargo/files/0001-update-Rust.patch +++ /dev/null @@ -1,906 +0,0 @@ -From d122d57536df9fbfcdfda08b2918dc6e0c6209c0 Mon Sep 17 00:00:00 2001 -From: Andrew Paseltiner -Date: Thu, 12 Feb 2015 23:10:07 -0500 -Subject: [PATCH] update Rust - ---- - Cargo.lock | 32 ++++++++++++------------ - src/bin/build.rs | 4 +-- - src/bin/cargo.rs | 2 +- - src/bin/clean.rs | 4 +-- - src/bin/generate_lockfile.rs | 4 +-- - src/bin/new.rs | 4 +-- - src/bin/update.rs | 4 +-- - src/bin/verify_project.rs | 4 +-- - src/bin/version.rs | 4 +-- - src/cargo/lib.rs | 2 +- - src/cargo/ops/cargo_new.rs | 4 +-- - src/cargo/ops/cargo_rustc/engine.rs | 2 +- - src/cargo/ops/registry.rs | 4 +-- - src/cargo/sources/git/utils.rs | 3 ++- - src/cargo/util/config.rs | 2 +- - src/cargo/util/hex.rs | 5 ++-- - src/cargo/util/profile.rs | 2 +- - src/rustversion.txt | 2 +- - tests/support/mod.rs | 2 +- - tests/test_cargo.rs | 2 +- - tests/test_cargo_compile.rs | 10 ++++---- - tests/test_cargo_compile_custom_build.rs | 42 ++++++++++++++++---------------- - tests/test_cargo_compile_git_deps.rs | 24 +++++++++--------- - tests/test_cargo_compile_plugins.rs | 6 ++--- - tests/test_cargo_cross_compile.rs | 28 ++++++++++----------- - tests/test_cargo_profiles.rs | 6 ++--- - 26 files changed, 103 insertions(+), 105 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 14dd876..629585c 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4,7 +4,7 @@ version = "0.1.0" - dependencies = [ - "advapi32-sys 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "curl 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "docopt 0.6.36 (registry+https://github.com/rust-lang/crates.io-index)", -+ "docopt 0.6.37 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -18,8 +18,8 @@ dependencies = [ - "semver 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "toml 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - ] -@@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "curl-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -@@ -55,13 +55,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "docopt" --version = "0.6.36" -+version = "0.6.37" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "regex 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -97,7 +97,7 @@ version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libgit2-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libgit2-sys 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -@@ -136,13 +136,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "libgit2-sys" --version = "0.1.12" -+version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libssh2-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -159,7 +159,7 @@ version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -@@ -192,12 +192,12 @@ dependencies = [ - - [[package]] - name = "openssl-sys" --version = "0.3.3" -+version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -207,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "pkg-config" --version = "0.2.0" -+version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] -@@ -255,7 +255,7 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.1.16" -+version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -264,7 +264,7 @@ dependencies = [ - - [[package]] - name = "toml" --version = "0.1.16" -+version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -diff --git a/src/bin/build.rs b/src/bin/build.rs -index a617f64..0784c04 100644 ---- a/src/bin/build.rs -+++ b/src/bin/build.rs -@@ -1,4 +1,4 @@ --use std::os; -+use std::env; - - use cargo::ops::CompileOptions; - use cargo::ops; -@@ -47,7 +47,7 @@ the --release flag will use the `release` profile instead. - "; - - pub fn execute(options: Options, config: &Config) -> CliResult> { -- debug!("executing; cmd=cargo-build; args={:?}", os::args()); -+ debug!("executing; cmd=cargo-build; args={:?}", env::args().collect::>()); - config.shell().set_verbose(options.flag_verbose); - - let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path)); -diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs -index 7bf0a11..53c904d 100644 ---- a/src/bin/cargo.rs -+++ b/src/bin/cargo.rs -@@ -245,7 +245,7 @@ fn list_command_directory() -> Vec { - dirs.push(path.join("../lib/cargo")); - dirs.push(path); - } -- if let Some(val) = env::var("PATH") { -+ if let Some(val) = env::var_os("PATH") { - dirs.extend(env::split_paths(&val)); - } - dirs -diff --git a/src/bin/clean.rs b/src/bin/clean.rs -index dcc013e..a530b9b 100644 ---- a/src/bin/clean.rs -+++ b/src/bin/clean.rs -@@ -1,4 +1,4 @@ --use std::os; -+use std::env; - - use cargo::ops; - use cargo::util::{CliResult, CliError, Config}; -@@ -33,7 +33,7 @@ and its format, see the `cargo help pkgid` command. - - pub fn execute(options: Options, config: &Config) -> CliResult> { - config.shell().set_verbose(options.flag_verbose); -- debug!("executing; cmd=cargo-clean; args={:?}", os::args()); -+ debug!("executing; cmd=cargo-clean; args={:?}", env::args().collect::>()); - - let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path)); - let opts = ops::CleanOptions { -diff --git a/src/bin/generate_lockfile.rs b/src/bin/generate_lockfile.rs -index a350ab6..d9777ef 100644 ---- a/src/bin/generate_lockfile.rs -+++ b/src/bin/generate_lockfile.rs -@@ -1,4 +1,4 @@ --use std::os; -+use std::env; - - use cargo::ops; - use cargo::util::{CliResult, CliError, Config}; -@@ -23,7 +23,7 @@ Options: - "; - - pub fn execute(options: Options, config: &Config) -> CliResult> { -- debug!("executing; cmd=cargo-generate-lockfile; args={:?}", os::args()); -+ debug!("executing; cmd=cargo-generate-lockfile; args={:?}", env::args().collect::>()); - config.shell().set_verbose(options.flag_verbose); - let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path)); - -diff --git a/src/bin/new.rs b/src/bin/new.rs -index 4126e38..0abff6a 100644 ---- a/src/bin/new.rs -+++ b/src/bin/new.rs -@@ -1,4 +1,4 @@ --use std::os; -+use std::env; - - use cargo::ops; - use cargo::util::{CliResult, CliError, Config}; -@@ -28,7 +28,7 @@ Options: - "; - - pub fn execute(options: Options, config: &Config) -> CliResult> { -- debug!("executing; cmd=cargo-new; args={:?}", os::args()); -+ debug!("executing; cmd=cargo-new; args={:?}", env::args().collect::>()); - config.shell().set_verbose(options.flag_verbose); - - let Options { flag_bin, arg_path, flag_vcs, .. } = options; -diff --git a/src/bin/update.rs b/src/bin/update.rs -index fa75506..4fdeebf 100644 ---- a/src/bin/update.rs -+++ b/src/bin/update.rs -@@ -1,4 +1,4 @@ --use std::os; -+use std::env; - - use cargo::ops; - use cargo::util::{CliResult, CliError, Config}; -@@ -49,7 +49,7 @@ For more information about package id specifications, see `cargo help pkgid`. - "; - - pub fn execute(options: Options, config: &Config) -> CliResult> { -- debug!("executing; cmd=cargo-update; args={:?}", os::args()); -+ debug!("executing; cmd=cargo-update; args={:?}", env::args().collect::>()); - config.shell().set_verbose(options.flag_verbose); - let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path)); - -diff --git a/src/bin/verify_project.rs b/src/bin/verify_project.rs -index 54f8d6e..816c5e9 100644 ---- a/src/bin/verify_project.rs -+++ b/src/bin/verify_project.rs -@@ -1,8 +1,8 @@ - extern crate toml; - - use std::collections::HashMap; -+use std::env; - use std::old_io::File; --use std::os; - - use cargo::util::{CliResult, Config}; - -@@ -47,6 +47,6 @@ pub fn execute(args: Flags, config: &Config) -> CliResult> { - fn fail(reason: &str, value: &str) -> CliResult>{ - let mut h = HashMap::new(); - h.insert(reason.to_string(), value.to_string()); -- os::set_exit_status(1); -+ env::set_exit_status(1); - Ok(Some(h)) - } -diff --git a/src/bin/version.rs b/src/bin/version.rs -index e1bc011..b5622f2 100644 ---- a/src/bin/version.rs -+++ b/src/bin/version.rs -@@ -1,4 +1,4 @@ --use std::os; -+use std::env; - - use cargo; - use cargo::util::{CliResult, Config}; -@@ -16,7 +16,7 @@ Options: - "; - - pub fn execute(_: Options, _: &Config) -> CliResult> { -- debug!("executing; cmd=cargo-version; args={:?}", os::args()); -+ debug!("executing; cmd=cargo-version; args={:?}", env::args().collect::>()); - - println!("{}", cargo::version()); - -diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs -index 609e1bd..d5737ef 100644 ---- a/src/cargo/lib.rs -+++ b/src/cargo/lib.rs -@@ -95,7 +95,7 @@ fn process(mut callback: F) - let mut shell = shell(true); - process_executed((|| { - let config = try!(Config::new(&mut shell)); -- let args: Vec<_> = try!(env::args().map(|s| { -+ let args: Vec<_> = try!(env::args_os().map(|s| { - s.into_string().map_err(|s| { - human(format!("invalid unicode in argument: {:?}", s)) - }) -diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs -index 09d8318..ae9d5e5 100644 ---- a/src/cargo/ops/cargo_new.rs -+++ b/src/cargo/ops/cargo_new.rs -@@ -134,8 +134,8 @@ fn discover_author() -> CargoResult<(String, Option)> { - let git_config = git_config.as_ref(); - let name = git_config.and_then(|g| g.get_str("user.name").ok()) - .map(|s| s.to_string()) -- .or_else(|| env::var_string("USER").ok()) // unix -- .or_else(|| env::var_string("USERNAME").ok()); // windows -+ .or_else(|| env::var("USER").ok()) // unix -+ .or_else(|| env::var("USERNAME").ok()); // windows - let name = match name { - Some(name) => name, - None => { -diff --git a/src/cargo/ops/cargo_rustc/engine.rs b/src/cargo/ops/cargo_rustc/engine.rs -index 5c6a0ef..9d234f8 100644 ---- a/src/cargo/ops/cargo_rustc/engine.rs -+++ b/src/cargo/ops/cargo_rustc/engine.rs -@@ -85,7 +85,7 @@ impl CommandPrototype { - - pub fn get_env(&self, var: &str) -> Option { - self.env.get(var).cloned().or_else(|| { -- Some(env::var_string(var).ok().map(|s| CString::from_vec(s.into_bytes()))) -+ Some(env::var(var).ok().map(|s| CString::from_vec(s.into_bytes()))) - }).and_then(|val| val) - } - -diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs -index 2461981..59754f2 100644 ---- a/src/cargo/ops/registry.rs -+++ b/src/cargo/ops/registry.rs -@@ -191,7 +191,7 @@ pub fn http_proxy(config: &Config) -> CargoResult> { - } - Err(..) => {} - } -- Ok(env::var_string("HTTP_PROXY").ok()) -+ Ok(env::var("HTTP_PROXY").ok()) - } - - pub fn http_timeout(config: &Config) -> CargoResult> { -@@ -199,7 +199,7 @@ pub fn http_timeout(config: &Config) -> CargoResult> { - Some((s, _)) => return Ok(Some(s)), - None => {} - } -- Ok(env::var_string("HTTP_TIMEOUT").ok().and_then(|s| s.parse().ok())) -+ Ok(env::var("HTTP_TIMEOUT").ok().and_then(|s| s.parse().ok())) - } - - pub fn registry_login(config: &Config, token: String) -> CargoResult<()> { -diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs -index 898f082..9861ed6 100644 ---- a/src/cargo/sources/git/utils.rs -+++ b/src/cargo/sources/git/utils.rs -@@ -308,7 +308,8 @@ impl<'a> GitCheckout<'a> { - // as the submodule's head, then we can bail out and go to the - // next submodule. - let head_and_repo = child.open().and_then(|repo| { -- Ok((try!(repo.head()).target(), repo)) -+ let target = try!(repo.head()).target(); -+ Ok((target, repo)) - }); - let repo = match head_and_repo { - Ok((head, repo)) => { -diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs -index 217d028..076e68d 100644 ---- a/src/cargo/util/config.rs -+++ b/src/cargo/util/config.rs -@@ -380,7 +380,7 @@ impl ConfigValue { - } - - fn homedir() -> Option { -- let cargo_home = env::var_string("CARGO_HOME").map(|p| Path::new(p)).ok(); -+ let cargo_home = env::var("CARGO_HOME").map(|p| Path::new(p)).ok(); - let user_home = env::home_dir().map(|p| p.join(".cargo")); - return cargo_home.or(user_home); - } -diff --git a/src/cargo/util/hex.rs b/src/cargo/util/hex.rs -index 2bce7ea..3e8d962 100644 ---- a/src/cargo/util/hex.rs -+++ b/src/cargo/util/hex.rs -@@ -1,12 +1,11 @@ --use std::old_io::MemWriter; - use std::hash::{Hasher, Hash, SipHasher}; - - use rustc_serialize::hex::ToHex; - - pub fn to_hex(num: u64) -> String { -- let mut writer = MemWriter::with_capacity(8); -+ let mut writer = Vec::with_capacity(8); - writer.write_le_u64(num).unwrap(); // this should never fail -- writer.get_ref().to_hex() -+ writer.to_hex() - } - - pub fn short_hash>(hashable: &H) -> String { -diff --git a/src/cargo/util/profile.rs b/src/cargo/util/profile.rs -index 9d19c36..100fd2c 100644 ---- a/src/cargo/util/profile.rs -+++ b/src/cargo/util/profile.rs -@@ -14,7 +14,7 @@ pub struct Profiler { - desc: String, - } - --fn enabled() -> bool { env::var("CARGO_PROFILE").is_some() } -+fn enabled() -> bool { env::var_os("CARGO_PROFILE").is_some() } - - pub fn start(desc: T) -> Profiler { - if !enabled() { return Profiler { desc: String::new() } } -diff --git a/src/rustversion.txt b/src/rustversion.txt -index e2a057d..17cae77 100644 ---- a/src/rustversion.txt -+++ b/src/rustversion.txt -@@ -1 +1 @@ --2015-02-09 -+2015-02-12 -diff --git a/tests/support/mod.rs b/tests/support/mod.rs -index 83be295..7c10756 100644 ---- a/tests/support/mod.rs -+++ b/tests/support/mod.rs -@@ -227,7 +227,7 @@ impl ErrMsg for Result { - - // Path to cargo executables - pub fn cargo_dir() -> Path { -- env::var_string("CARGO_BIN_PATH").map(Path::new).ok() -+ env::var("CARGO_BIN_PATH").map(Path::new).ok() - .or_else(|| env::current_exe().ok().map(|s| s.dir_path())) - .unwrap_or_else(|| { - panic!("CARGO_BIN_PATH wasn't set. Cannot continue running test") -diff --git a/tests/test_cargo.rs b/tests/test_cargo.rs -index b4b1abd..64e4c75 100644 ---- a/tests/test_cargo.rs -+++ b/tests/test_cargo.rs -@@ -25,7 +25,7 @@ fn fake_executable(proj: ProjectBuilder, dir: &Path, name: &str) -> ProjectBuild - } - - fn path() -> Vec { -- env::split_paths(&env::var("PATH").unwrap_or(OsString::new())).collect() -+ env::split_paths(&env::var_os("PATH").unwrap_or(OsString::new())).collect() - } - - test!(list_commands_looks_at_path { -diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs -index 20fcab8..9c5b934 100644 ---- a/tests/test_cargo_compile.rs -+++ b/tests/test_cargo_compile.rs -@@ -1259,7 +1259,7 @@ test!(freshness_ignores_excluded { - exclude = ["src/b*.rs"] - "#) - .file("build.rs", "fn main() {}") -- .file("src/lib.rs", "pub fn bar() -> int { 1 }"); -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }"); - foo.build(); - foo.root().move_into_the_past().unwrap(); - -@@ -1297,15 +1297,15 @@ test!(rebuild_preserves_out_dir { - use std::old_io::File; - - fn main() { -- let path = Path::new(env::var_string("OUT_DIR").unwrap()).join("foo"); -- if env::var("FIRST").is_some() { -+ let path = Path::new(env::var("OUT_DIR").unwrap()).join("foo"); -+ if env::var_os("FIRST").is_some() { - File::create(&path).unwrap(); - } else { - File::create(&path).unwrap(); - } - } - "#) -- .file("src/lib.rs", "pub fn bar() -> int { 1 }"); -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }"); - foo.build(); - foo.root().move_into_the_past().unwrap(); - -@@ -1335,7 +1335,7 @@ test!(dep_no_libs { - [dependencies.bar] - path = "bar" - "#) -- .file("src/lib.rs", "pub fn bar() -> int { 1 }") -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }") - .file("bar/Cargo.toml", r#" - [package] - name = "bar" -diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs -index b110b86..4ef727b 100644 ---- a/tests/test_cargo_compile_custom_build.rs -+++ b/tests/test_cargo_compile_custom_build.rs -@@ -79,32 +79,32 @@ test!(custom_build_env_vars { - use std::env; - use std::old_io::fs::PathExtensions; - fn main() {{ -- let _target = env::var_string("TARGET").unwrap(); -+ let _target = env::var("TARGET").unwrap(); - -- let _ncpus = env::var_string("NUM_JOBS").unwrap(); -+ let _ncpus = env::var("NUM_JOBS").unwrap(); - -- let out = env::var_string("CARGO_MANIFEST_DIR").unwrap(); -+ let out = env::var("CARGO_MANIFEST_DIR").unwrap(); - let p1 = Path::new(out); - let cwd = env::current_dir().unwrap(); - let p2 = cwd.join(Path::new(file!()).dir_path().dir_path()); - assert!(p1 == p2, "{{}} != {{}}", p1.display(), p2.display()); - -- let opt = env::var_string("OPT_LEVEL").unwrap(); -+ let opt = env::var("OPT_LEVEL").unwrap(); - assert_eq!(opt.as_slice(), "0"); - -- let opt = env::var_string("PROFILE").unwrap(); -+ let opt = env::var("PROFILE").unwrap(); - assert_eq!(opt.as_slice(), "compile"); - -- let debug = env::var_string("DEBUG").unwrap(); -+ let debug = env::var("DEBUG").unwrap(); - assert_eq!(debug.as_slice(), "true"); - -- let out = env::var_string("OUT_DIR").unwrap(); -+ let out = env::var("OUT_DIR").unwrap(); - assert!(out.as_slice().starts_with(r"{0}")); - assert!(Path::new(out).is_dir()); - -- let _host = env::var_string("HOST").unwrap(); -+ let _host = env::var("HOST").unwrap(); - -- let _feat = env::var_string("CARGO_FEATURE_FOO").unwrap(); -+ let _feat = env::var("CARGO_FEATURE_FOO").unwrap(); - }} - "#, - p.root().join("target").join("build").display()); -@@ -269,8 +269,8 @@ test!(overrides_and_links { - .file("build.rs", r#" - use std::env; - fn main() { -- assert_eq!(env::var_string("DEP_FOO_FOO").unwrap().as_slice(), "bar"); -- assert_eq!(env::var_string("DEP_FOO_BAR").unwrap().as_slice(), "baz"); -+ assert_eq!(env::var("DEP_FOO_FOO").unwrap().as_slice(), "bar"); -+ assert_eq!(env::var("DEP_FOO_BAR").unwrap().as_slice(), "baz"); - } - "#) - .file(".cargo/config", format!(r#" -@@ -342,8 +342,8 @@ test!(links_passes_env_vars { - .file("build.rs", r#" - use std::env; - fn main() { -- assert_eq!(env::var_string("DEP_FOO_FOO").unwrap().as_slice(), "bar"); -- assert_eq!(env::var_string("DEP_FOO_BAR").unwrap().as_slice(), "baz"); -+ assert_eq!(env::var("DEP_FOO_FOO").unwrap().as_slice(), "bar"); -+ assert_eq!(env::var("DEP_FOO_BAR").unwrap().as_slice(), "baz"); - } - "#) - .file("a/Cargo.toml", r#" -@@ -441,8 +441,8 @@ test!(rebuild_continues_to_pass_env_vars { - .file("build.rs", r#" - use std::env; - fn main() { -- assert_eq!(env::var_string("DEP_FOO_FOO").unwrap().as_slice(), "bar"); -- assert_eq!(env::var_string("DEP_FOO_BAR").unwrap().as_slice(), "baz"); -+ assert_eq!(env::var("DEP_FOO_FOO").unwrap().as_slice(), "bar"); -+ assert_eq!(env::var("DEP_FOO_BAR").unwrap().as_slice(), "baz"); - } - "#); - -@@ -727,7 +727,7 @@ test!(out_dir_is_preserved { - use std::env; - use std::old_io::File; - fn main() { -- let out = env::var_string("OUT_DIR").unwrap(); -+ let out = env::var("OUT_DIR").unwrap(); - File::create(&Path::new(out).join("foo")).unwrap(); - } - "#); -@@ -742,7 +742,7 @@ test!(out_dir_is_preserved { - use std::env; - use std::old_io::File; - fn main() { -- let out = env::var_string("OUT_DIR").unwrap(); -+ let out = env::var("OUT_DIR").unwrap(); - File::open(&Path::new(out).join("foo")).unwrap(); - } - "#).unwrap(); -@@ -808,7 +808,7 @@ test!(code_generation { - use std::old_io::File; - - fn main() { -- let dst = Path::new(env::var_string("OUT_DIR").unwrap()); -+ let dst = Path::new(env::var("OUT_DIR").unwrap()); - let mut f = File::create(&dst.join("hello.rs")).unwrap(); - f.write_str(" - pub fn message() -> &'static str { -@@ -972,9 +972,9 @@ test!(test_a_lib_with_a_build_command { - use std::old_io::File; - - fn main() { -- let out = Path::new(env::var_string("OUT_DIR").unwrap()); -+ let out = Path::new(env::var("OUT_DIR").unwrap()); - File::create(&out.join("foo.rs")).write_str(" -- fn foo() -> int { 1 } -+ fn foo() -> i32 { 1 } - ").unwrap(); - } - "#); -@@ -1062,7 +1062,7 @@ test!(build_script_with_dynamic_native_dependency { - use std::env; - - fn main() { -- let src = Path::new(env::var_string("SRC").unwrap()); -+ let src = Path::new(env::var("SRC").unwrap()); - println!("cargo:rustc-flags=-L {}", src.dir_path().display()); - } - "#) -diff --git a/tests/test_cargo_compile_git_deps.rs b/tests/test_cargo_compile_git_deps.rs -index 5777e1a..11a152f 100644 ---- a/tests/test_cargo_compile_git_deps.rs -+++ b/tests/test_cargo_compile_git_deps.rs -@@ -461,7 +461,7 @@ test!(two_revs_same_deps { - version = "0.0.0" - authors = [] - "#) -- .file("src/lib.rs", "pub fn bar() -> int { 1 }") -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }") - }).unwrap(); - - let repo = git2::Repository::open(&bar.root()).unwrap(); -@@ -469,7 +469,7 @@ test!(two_revs_same_deps { - - // Commit the changes and make sure we trigger a recompile - File::create(&bar.root().join("src/lib.rs")).write_str(r#" -- pub fn bar() -> int { 2 } -+ pub fn bar() -> i32 { 2 } - "#).unwrap(); - add(&repo); - let rev2 = commit(&repo); -@@ -511,7 +511,7 @@ test!(two_revs_same_deps { - "#, bar.url(), rev2).as_slice()) - .file("src/lib.rs", r#" - extern crate bar; -- pub fn baz() -> int { bar::bar() } -+ pub fn baz() -> i32 { bar::bar() } - "#); - - baz.build(); -@@ -860,7 +860,7 @@ test!(stale_cached_version { - version = "0.0.0" - authors = [] - "#) -- .file("src/lib.rs", "pub fn bar() -> int { 1 }") -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }") - }).unwrap(); - - // Update the git database in the cache with the current state of the git -@@ -887,7 +887,7 @@ test!(stale_cached_version { - // Update the repo, and simulate someone else updating the lockfile and then - // us pulling it down. - File::create(&bar.root().join("src/lib.rs")).write_str(r#" -- pub fn bar() -> int { 1 + 0 } -+ pub fn bar() -> i32 { 1 + 0 } - "#).unwrap(); - let repo = git2::Repository::open(&bar.root()).unwrap(); - add(&repo); -@@ -1090,7 +1090,7 @@ test!(git_build_cmd_freshness { - build = "build.rs" - "#) - .file("build.rs", "fn main() {}") -- .file("src/lib.rs", "pub fn bar() -> int { 1 }") -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }") - .file(".gitignore", " - src/bar.rs - ") -@@ -1166,7 +1166,7 @@ test!(git_repo_changing_no_rebuild { - version = "0.5.0" - authors = ["wycats@example.com"] - "#) -- .file("src/lib.rs", "pub fn bar() -> int { 1 }") -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }") - }).unwrap(); - - // Lock p1 to the first rev in the git repo -@@ -1193,7 +1193,7 @@ test!(git_repo_changing_no_rebuild { - - // Make a commit to lock p2 to a different rev - File::create(&bar.root().join("src/lib.rs")).write_str(r#" -- pub fn bar() -> int { 2 } -+ pub fn bar() -> i32 { 2 } - "#).unwrap(); - let repo = git2::Repository::open(&bar.root()).unwrap(); - add(&repo); -@@ -1256,7 +1256,7 @@ test!(git_dep_build_cmd { - name = "bar" - "#) - .file("bar/src/bar.rs.in", r#" -- pub fn gimme() -> int { 0 } -+ pub fn gimme() -> i32 { 0 } - "#) - .file("bar/build.rs", r#" - use std::old_io::fs; -@@ -1278,7 +1278,7 @@ test!(git_dep_build_cmd { - - // Touching bar.rs.in should cause the `build` command to run again. - let mut file = fs::File::create(&p.root().join("bar/src/bar.rs.in")).unwrap(); -- file.write_str(r#"pub fn gimme() -> int { 1 }"#).unwrap(); -+ file.write_str(r#"pub fn gimme() -> i32 { 1 }"#).unwrap(); - drop(file); - - assert_that(p.process(cargo_dir().join("cargo")).arg("build"), -@@ -1297,7 +1297,7 @@ test!(fetch_downloads { - version = "0.5.0" - authors = ["wycats@example.com"] - "#) -- .file("src/lib.rs", "pub fn bar() -> int { 1 }") -+ .file("src/lib.rs", "pub fn bar() -> i32 { 1 }") - }).unwrap(); - - let p = project("p1") -@@ -1569,7 +1569,7 @@ test!(update_one_source_updates_all_packages_in_that_git_source { - - // Just be sure to change a file - File::create(&dep.root().join("src/lib.rs")).write_str(r#" -- pub fn bar() -> int { 2 } -+ pub fn bar() -> i32 { 2 } - "#).unwrap(); - add(&repo); - commit(&repo); -diff --git a/tests/test_cargo_compile_plugins.rs b/tests/test_cargo_compile_plugins.rs -index 853038f..ca44a4d 100644 ---- a/tests/test_cargo_compile_plugins.rs -+++ b/tests/test_cargo_compile_plugins.rs -@@ -23,14 +23,14 @@ test!(plugin_to_the_max { - "#) - .file("src/main.rs", r#" - #![feature(plugin)] -- #[plugin] #[no_link] extern crate bar; -+ #![plugin(bar)] - extern crate foo_lib; - - fn main() { foo_lib::foo(); } - "#) - .file("src/foo_lib.rs", r#" - #![feature(plugin)] -- #[plugin] #[no_link] extern crate bar; -+ #![plugin(bar)] - - pub fn foo() {} - "#); -@@ -122,7 +122,7 @@ test!(plugin_with_dynamic_native_dependency { - "#) - .file("src/main.rs", r#" - #![feature(plugin)] -- #[plugin] #[no_link] extern crate bar; -+ #![plugin(bar)] - - fn main() {} - "#) -diff --git a/tests/test_cargo_cross_compile.rs b/tests/test_cargo_cross_compile.rs -index a2d53e0..cf6b9a5 100644 ---- a/tests/test_cargo_cross_compile.rs -+++ b/tests/test_cargo_cross_compile.rs -@@ -12,7 +12,7 @@ fn setup() { - - fn disabled() -> bool { - // First, disable if ./configure requested so -- match env::var_string("CFG_DISABLE_CROSS_TESTS") { -+ match env::var("CFG_DISABLE_CROSS_TESTS") { - Ok(ref s) if s.as_slice() == "1" => return true, - _ => {} - } -@@ -44,7 +44,7 @@ test!(simple_cross { - "#) - .file("build.rs", format!(r#" - fn main() {{ -- assert_eq!(std::env::var_string("TARGET").unwrap().as_slice(), "{}"); -+ assert_eq!(std::env::var("TARGET").unwrap().as_slice(), "{}"); - }} - "#, alternate()).as_slice()) - .file("src/main.rs", r#" -@@ -119,8 +119,7 @@ test!(plugin_deps { - "#) - .file("src/main.rs", r#" - #![feature(plugin)] -- #[plugin] #[no_link] -- extern crate bar; -+ #![plugin(bar)] - extern crate baz; - fn main() { - assert_eq!(bar!(), baz::baz()); -@@ -155,7 +154,7 @@ test!(plugin_deps { - - fn expand_bar(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree]) - -> Box { -- MacExpr::new(quote_expr!(cx, 1i)) -+ MacExpr::new(quote_expr!(cx, 1)) - } - "#); - let baz = project("baz") -@@ -165,7 +164,7 @@ test!(plugin_deps { - version = "0.0.1" - authors = [] - "#) -- .file("src/lib.rs", "pub fn baz() -> int { 1 }"); -+ .file("src/lib.rs", "pub fn baz() -> i32 { 1 }"); - bar.build(); - baz.build(); - -@@ -197,8 +196,7 @@ test!(plugin_to_the_max { - "#) - .file("src/main.rs", r#" - #![feature(plugin)] -- #[plugin] #[no_link] -- extern crate bar; -+ #![plugin(bar)] - extern crate baz; - fn main() { - assert_eq!(bar!(), baz::baz()); -@@ -320,7 +318,7 @@ test!(plugin_with_extra_dylib_dep { - "#) - .file("src/main.rs", r#" - #![feature(plugin)] -- #[plugin] #[no_link] extern crate bar; -+ #![plugin(bar)] - - fn main() {} - "#); -@@ -362,7 +360,7 @@ test!(plugin_with_extra_dylib_dep { - name = "baz" - crate_type = ["dylib"] - "#) -- .file("src/lib.rs", "pub fn baz() -> int { 1 }"); -+ .file("src/lib.rs", "pub fn baz() -> i32 { 1 }"); - bar.build(); - baz.build(); - -@@ -464,8 +462,8 @@ test!(cross_with_a_build_script { - .file("build.rs", format!(r#" - use std::env; - fn main() {{ -- assert_eq!(env::var_string("TARGET").unwrap().as_slice(), "{0}"); -- let mut path = Path::new(env::var_string("OUT_DIR").unwrap()); -+ assert_eq!(env::var("TARGET").unwrap().as_slice(), "{0}"); -+ let mut path = Path::new(env::var("OUT_DIR").unwrap()); - assert_eq!(path.filename().unwrap(), b"out"); - path.pop(); - assert!(path.filename().unwrap().starts_with(b"foo-")); -@@ -530,7 +528,7 @@ test!(build_script_needed_for_host_and_target { - .file("d1/build.rs", r#" - use std::env; - fn main() { -- let target = env::var_string("TARGET").unwrap(); -+ let target = env::var("TARGET").unwrap(); - println!("cargo:rustc-flags=-L /path/to/{}", target); - } - "#) -@@ -643,9 +641,9 @@ test!(build_script_only_host { - use std::env; - - fn main() { -- assert!(env::var_string("OUT_DIR").unwrap() -+ assert!(env::var("OUT_DIR").unwrap() - .contains("target/build/d1-"), -- "bad: {:?}", env::var_string("OUT_DIR")); -+ "bad: {:?}", env::var("OUT_DIR")); - } - "#); - -diff --git a/tests/test_cargo_profiles.rs b/tests/test_cargo_profiles.rs -index b71eadb..827393f 100644 ---- a/tests/test_cargo_profiles.rs -+++ b/tests/test_cargo_profiles.rs -@@ -1,4 +1,4 @@ --use std::os; -+use std::env; - use std::old_path; - - use support::{project, execs}; -@@ -110,6 +110,6 @@ test!(top_level_overrides_deps { - dir = p.root().display(), - url = p.url(), - sep = old_path::SEP, -- prefix = os::consts::DLL_PREFIX, -- suffix = os::consts::DLL_SUFFIX).as_slice())); -+ prefix = env::consts::DLL_PREFIX, -+ suffix = env::consts::DLL_SUFFIX).as_slice())); - }); --- -2.3.0 - diff --git a/recipes/cargo/files/0001-update-pkg-versions.patch b/recipes/cargo/files/0001-update-pkg-versions.patch deleted file mode 100644 index d667e97..0000000 --- a/recipes/cargo/files/0001-update-pkg-versions.patch +++ /dev/null @@ -1,138 +0,0 @@ -From f32fa685610399739a2584ae02653753a372d6ed Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Fri, 13 Feb 2015 15:24:16 -0500 -Subject: [PATCH] update pkg versions - ---- - Cargo.lock | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 14dd876..629585c 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4,7 +4,7 @@ version = "0.1.0" - dependencies = [ - "advapi32-sys 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "curl 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "docopt 0.6.36 (registry+https://github.com/rust-lang/crates.io-index)", -+ "docopt 0.6.37 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -18,8 +18,8 @@ dependencies = [ - "semver 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "toml 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - ] -@@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "curl-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -@@ -55,13 +55,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "docopt" --version = "0.6.36" -+version = "0.6.37" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "regex 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -97,7 +97,7 @@ version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libgit2-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libgit2-sys 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -@@ -136,13 +136,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "libgit2-sys" --version = "0.1.12" -+version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libssh2-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -159,7 +159,7 @@ version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -@@ -192,12 +192,12 @@ dependencies = [ - - [[package]] - name = "openssl-sys" --version = "0.3.3" -+version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -207,7 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "pkg-config" --version = "0.2.0" -+version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] -@@ -255,7 +255,7 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.1.16" -+version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "gcc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -264,7 +264,7 @@ dependencies = [ - - [[package]] - name = "toml" --version = "0.1.16" -+version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", --- -2.3.0 - 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 deleted file mode 100644 index 5a6a262..0000000 --- a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 797df37f3a9b377db475f3d2eae09fcbb90d2e4f Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Tue, 25 Nov 2014 11:50:28 -0500 -Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl. If it is - needed, pkgconfig will pull it in - ---- - curl-sys/Cargo.toml | 19 ------------------- - curl-sys/lib.rs | 2 -- - 2 files changed, 21 deletions(-) - -diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml -index 6e99e16..50d1101 100644 ---- a/curl-sys/Cargo.toml -+++ b/curl-sys/Cargo.toml -@@ -18,23 +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.6.0" --[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.6.0" --[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.6.0" --[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" --[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" --[target.x86_64-unknown-bitrig.dependencies] - openssl-sys = "0.6.0" -diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs -index 7cae355..a2d58ea 100644 ---- a/curl-sys/lib.rs -+++ b/curl-sys/lib.rs -@@ -1,8 +1,6 @@ - #![allow(non_camel_case_types, raw_pointer_derive)] - - extern crate libc; --#[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.3 - diff --git a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.patch b/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.patch new file mode 100644 index 0000000..2e60687 --- /dev/null +++ b/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.patch @@ -0,0 +1,62 @@ +From 6d74b6af6a23e195fc54c81a9bbdb21e7d5b6414 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Sat, 12 Dec 2015 22:36:26 -0500 +Subject: [PATCH 1/2] curl-sys: avoid explicitly linking in openssl + +linking libcurl with libssl is handled by pkg-config, not us +This also allows non-blessed triples to work. +--- + curl-sys/Cargo.toml | 26 -------------------------- + curl-sys/lib.rs | 2 -- + 2 files changed, 28 deletions(-) + +diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml +index bf994bf..f153039 100644 +--- a/curl-sys/Cargo.toml ++++ b/curl-sys/Cargo.toml +@@ -19,29 +19,3 @@ path = "lib.rs" + [dependencies] + libz-sys = ">= 0" + libc = "0.2" +- +-# Unix platforms use OpenSSL for now to provide SSL functionality +-[target.i686-unknown-linux-gnu.dependencies] +-openssl-sys = ">= 0" +-[target.i686-linux-android.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-linux-gnu.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-linux-musl.dependencies] +-openssl-sys = ">= 0" +-[target.arm-unknown-linux-gnueabihf.dependencies] +-openssl-sys = ">= 0" +-[target.arm-linux-androideabi.dependencies] +-openssl-sys = ">= 0" +-[target.aarch64-unknown-linux-gnu.dependencies] +-openssl-sys = ">= 0" +-[target.i686-unknown-freebsd.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-freebsd.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-bitrig.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-openbsd.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-dragonfly.dependencies] +-openssl-sys = ">= 0" +diff --git a/curl-sys/lib.rs b/curl-sys/lib.rs +index be80469..b53b445 100644 +--- a/curl-sys/lib.rs ++++ b/curl-sys/lib.rs +@@ -3,8 +3,6 @@ + extern crate libc; + #[cfg(not(target_env = "msvc"))] + extern crate libz_sys; +-#[cfg(all(unix, not(target_os = "macos")))] +-extern crate openssl_sys; + + use libc::{c_void, c_int, c_char, c_uint, c_long}; + +-- +2.4.10 + 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 index dcaa1aa..2b2b865 100644 --- 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 @@ -1,48 +1,54 @@ -From 625b2491eca17e78fdec374f8e83ec00fcca5fc8 Mon Sep 17 00:00:00 2001 +From 445289f4eacc5c048e4a455bb6d6a6a2b9995e88 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 +Date: Sat, 12 Dec 2015 22:40:33 -0500 +Subject: [PATCH 2/2] remove per triple deps on openssl-sys --- - Cargo.toml | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) + Cargo.toml | 27 +-------------------------- + 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 16b72c3..68235ae 100644 +index 74f63c8..28aa1fa 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -12,30 +12,11 @@ url = "0.2.0" +@@ -12,36 +12,11 @@ url = "0.2.0" log = "0.3.0" - libc = "0.1" + libc = "0.2" curl-sys = { path = "curl-sys", version = "0.1.0" } -+openssl-sys = "0.6.0" ++openssl-sys = "0.7.0" [dev-dependencies] env_logger = "0.3.0" -# Unix platforms use OpenSSL for now to provide SSL functionality --[target.i686-apple-darwin.dependencies] --openssl-sys = "0.6.0" --[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.6.0" -[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" +-openssl-sys = "0.7.0" +-[target.i686-linux-android.dependencies] +-openssl-sys = "0.7.0" -[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-linux-musl.dependencies] +-openssl-sys = "0.7.0" -[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.6.0" +-openssl-sys = "0.7.0" +-[target.arm-linux-androideabi.dependencies] +-openssl-sys = "0.7.0" -[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" +-openssl-sys = "0.7.0" -[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" +-openssl-sys = "0.7.0" -[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" +-openssl-sys = "0.7.0" -[target.x86_64-unknown-bitrig.dependencies] --openssl-sys = "0.6.0" +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-openbsd.dependencies] +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-dragonfly.dependencies] +-openssl-sys = "0.7.0" - [[test]] name = "test" -- -2.4.3 +2.4.10 diff --git a/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch b/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch deleted file mode 100644 index 6243a28..0000000 --- a/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch +++ /dev/null @@ -1,59 +0,0 @@ -From aa1bea8387b6108ca2cd60ad71e8d354d8790d62 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Mon, 10 Nov 2014 15:06:29 -0500 -Subject: [PATCH] Add generic openssl-sys dep - ---- - 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 9c0aa6c..d95d07e 100644 ---- a/libgit2-sys/Cargo.toml -+++ b/libgit2-sys/Cargo.toml -@@ -16,40 +16,8 @@ description = "Native bindings to the libgit2 library" - [dependencies] - libssh2-sys = "0.1.0" - libc = "0.1" -+openssl-sys = "0.6.0" -+libz-sys = "0.1.0" - - [build-dependencies] - pkg-config = "0.3" -- --[target.i686-apple-darwin.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[target.x86_64-unknown-bitrig.dependencies] --openssl-sys = "0.6.0" --libz-sys = "0.1.0" --[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.3 - diff --git a/recipes/cargo/files/git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch b/recipes/cargo/files/git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch new file mode 100644 index 0000000..a525607 --- /dev/null +++ b/recipes/cargo/files/git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch @@ -0,0 +1,50 @@ +From 95709b3f5b1495a57043975d7100461feed46b2f Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Sat, 12 Dec 2015 22:53:37 -0500 +Subject: [PATCH] libgit2-sys: avoid blessed triples + +--- + libgit2-sys/Cargo.toml | 22 +--------------------- + 1 file changed, 1 insertion(+), 21 deletions(-) + +diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml +index 15b28d8..3590878 100644 +--- a/libgit2-sys/Cargo.toml ++++ b/libgit2-sys/Cargo.toml +@@ -17,32 +17,12 @@ path = "lib.rs" + libssh2-sys = { version = ">= 0", optional = true } + libc = "0.2" + libz-sys = ">= 0" ++openssl-sys = "0.7.0" + + [build-dependencies] + pkg-config = "0.3" + cmake = "0.1.2" + +-[target.i686-unknown-linux-gnu.dependencies] +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-linux-gnu.dependencies] +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-linux-musl.dependencies] +-openssl-sys = "0.7.0" +-[target.aarch64-unknown-linux-gnu.dependencies] +-openssl-sys = "0.7.0" +-[target.arm-unknown-linux-gnueabihf.dependencies] +-openssl-sys = "0.7.0" +-[target.i686-unknown-freebsd.dependencies] +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-freebsd.dependencies] +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-bitrig.dependencies] +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-openbsd.dependencies] +-openssl-sys = "0.7.0" +-[target.x86_64-unknown-dragonfly.dependencies] +-openssl-sys = "0.7.0" +- + [features] + ssh = ["libssh2-sys"] + https = [] +-- +2.4.10 + diff --git a/recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch b/recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch deleted file mode 100644 index 4b5f42d..0000000 --- a/recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a1ba6ce6f54e3b2b0c3e05043a015bc845d24025 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Tue, 26 May 2015 22:10:18 -0400 -Subject: [PATCH 2/3] libgit2-sys: avoid the build script, it is a disaster - ---- - libgit2-sys/build.rs | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs -index d624a63..9b8b98c 100644 ---- a/libgit2-sys/build.rs -+++ b/libgit2-sys/build.rs -@@ -15,6 +15,9 @@ macro_rules! t { - } - - fn main() { -+ pkg_config::find_library("libgit2").unwrap(); -+ return; -+ - register_dep("SSH2"); - register_dep("OPENSSL"); - --- -2.4.3 - diff --git a/recipes/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch b/recipes/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch deleted file mode 100644 index 883a739..0000000 --- a/recipes/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ce3e8e83be261ed7cf0a62dc8e66361588329ba2 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -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 - 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 deleted file mode 100644 index 42e91c9..0000000 --- a/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b45c6ed5524690603a1888dff21556b7f42db474 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Mon, 1 Dec 2014 10:51:31 -0500 -Subject: [PATCH] Unconditionally depend on openssl-sys - ---- - libssh2-sys/Cargo.toml | 22 ---------------------- - 1 file changed, 22 deletions(-) - -diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml -index 501bba5..db8d21a 100644 ---- a/libssh2-sys/Cargo.toml -+++ b/libssh2-sys/Cargo.toml -@@ -15,28 +15,6 @@ path = "lib.rs" - [dependencies] - libz-sys = "0.1.0" - libc = "0.1" -- --[target.i686-apple-darwin.dependencies] --openssl-sys = "0.6.0" --[target.x86_64-apple-darwin.dependencies] --openssl-sys = "0.6.0" --[target.i686-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --[target.x86_64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --[target.aarch64-unknown-linux-gnu.dependencies] --openssl-sys = "0.6.0" --[target.arm-unknown-linux-gnueabihf.dependencies] --openssl-sys = "0.6.0" --[target.i686-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" --[target.x86_64-unknown-freebsd.dependencies] --openssl-sys = "0.6.0" --[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.3 - diff --git a/recipes/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch b/recipes/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch new file mode 100644 index 0000000..18465b7 --- /dev/null +++ b/recipes/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch @@ -0,0 +1,62 @@ +From be07c11b438550829d82dc844e38806570232cd7 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Sat, 12 Dec 2015 22:44:14 -0500 +Subject: [PATCH] libssh2-sys: avoid explicitly linking in openssl + +--- + libssh2-sys/Cargo.toml | 25 ------------------------- + libssh2-sys/lib.rs | 2 -- + 2 files changed, 27 deletions(-) + +diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml +index b9ecec2..78f92ac 100644 +--- a/libssh2-sys/Cargo.toml ++++ b/libssh2-sys/Cargo.toml +@@ -18,31 +18,6 @@ libc = "0.2" + ws2_32-sys = ">= 0" + winapi = "0.2" + +-[target.i686-apple-darwin.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-apple-darwin.dependencies] +-openssl-sys = ">= 0" +-[target.i686-unknown-linux-gnu.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-linux-gnu.dependencies] +-openssl-sys = ">= 0" +-[target.aarch64-unknown-linux-gnu.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-linux-musl.dependencies] +-openssl-sys = ">= 0" +-[target.arm-unknown-linux-gnueabihf.dependencies] +-openssl-sys = ">= 0" +-[target.i686-unknown-freebsd.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-freebsd.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-dragonfly.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-bitrig.dependencies] +-openssl-sys = ">= 0" +-[target.x86_64-unknown-openbsd.dependencies] +-openssl-sys = ">= 0" +- + [build-dependencies] + pkg-config = "0.3" + cmake = "0.1.2" +diff --git a/libssh2-sys/lib.rs b/libssh2-sys/lib.rs +index bb6c46f..40af82f 100644 +--- a/libssh2-sys/lib.rs ++++ b/libssh2-sys/lib.rs +@@ -6,8 +6,6 @@ extern crate ws2_32; + extern crate winapi; + + extern crate libz_sys; +-#[cfg(unix)] +-extern crate openssl_sys; + + use libc::{c_int, size_t, c_void, c_char, c_long, c_uchar, c_uint, c_ulong}; + use libc::ssize_t; +-- +2.4.10 +