56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
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
|
|
|