From 2f7fbde7895438d2913b8f2697b43ccba138ad6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Fri, 25 Sep 2020 23:23:13 +0200 Subject: [PATCH] Add `vendored_openssl` feature. This feature enables the `vendored` feature from the `openssl` crate and build a statically linked version of openssl. --- Cargo.lock | 10 ++++++++++ Cargo.toml | 2 ++ 2 files changed, 12 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index b6a3d67e..f3fc285f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1552,6 +1552,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +[[package]] +name = "openssl-src" +version = "111.11.0+1.1.1h" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.58" @@ -1561,6 +1570,7 @@ dependencies = [ "autocfg 1.0.1", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml index 383d6314..6bf40a6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,8 @@ enable_syslog = [] mysql = ["diesel/mysql", "diesel_migrations/mysql"] postgresql = ["diesel/postgres", "diesel_migrations/postgres"] sqlite = ["diesel/sqlite", "diesel_migrations/sqlite", "libsqlite3-sys"] +# Enable to use a vendored and statically linked openssl +vendored_openssl = ["openssl/vendored"] # Enable unstable features, requires nightly # Currently only used to enable rusts official ip support