Derek Straka
63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
From 6d74b6af6a23e195fc54c81a9bbdb21e7d5b6414 Mon Sep 17 00:00:00 2001
|
|
From: Cody P Schafer <dev@codyps.com>
|
|
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
|
|
|