move recipes/{rust,cargo} to recipes-devtools

This better matches where upstream puts compilers and development
utilities.
This commit is contained in:
Doug Goldstein committed 2015-12-11 00:43:18 -06:00
1 parent 0653dc1572
commit 9a1f1aad8d
41 files changed
+1 -1

No files matched your search

@@ -0,0 +1,55 @@
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
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
@@ -0,0 +1,48 @@
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
---
Cargo.toml | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 16b72c3..68235ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,30 +12,11 @@ url = "0.2.0"
log = "0.3.0"
libc = "0.1"
curl-sys = { path = "curl-sys", version = "0.1.0" }
+openssl-sys = "0.6.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"
-[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"
-
[[test]]
name = "test"
--
2.4.3