0003-Replace-bundled-C-C-libraries-with-system-provided.patch

From ad55b5d398b3c319ae2c7e63a2fe094c8f3a1d14 Mon Sep 17 00:00:00 2001
From: Ivan Mironov <mironov.ivan@gmail.com>
Date: Thu, 18 Feb 2021 17:17:32 +0500
Subject: [PATCH 3/3] Replace bundled C/C++ libraries with system provided

---
 Cargo.lock                  | 11 +----------
 account-decoder/Cargo.toml  |  2 +-
 remote-wallet/Cargo.toml    |  2 +-
 runtime/Cargo.toml          |  2 +-
 storage-bigtable/Cargo.toml | 10 +---------
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7719ac542dae..b19b92003843 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2776,15 +2776,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
-[[package]]
-name = "openssl-src"
-version = "300.0.4+3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216e1c6b4549e24182b9d7aa268f645414888a69daf44c7b2d8118da8e7b23e7"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.70"
@@ -2794,7 +2785,6 @@ dependencies = [
  "autocfg 1.0.1",
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -7593,4 +7583,5 @@ checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33"
 dependencies = [
  "cc",
  "libc",
+ "pkg-config",
 ]
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index 425c2fe2f876..e083fbb14788 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -24,7 +24,7 @@ solana-sdk = { path = "../sdk", version = "=1.9.4" }
 solana-vote-program = { path = "../programs/vote", version = "=1.9.4" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
-zstd = "0.9.0"
+zstd = { version = "0.9.0", features = ["pkg-config"] }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml
index d66c915a7113..938dd3a1764d 100644
--- a/remote-wallet/Cargo.toml
+++ b/remote-wallet/Cargo.toml
@@ -25,7 +25,7 @@ thiserror = "1.0"
 uriparse = "0.6.3"
 
 [features]
-default = ["linux-static-hidraw"]
+default = ["linux-shared-hidraw"]
 linux-static-libusb = ["hidapi/linux-static-libusb"]
 linux-static-hidraw = ["hidapi/linux-static-hidraw"]
 linux-shared-libusb = ["hidapi/linux-shared-libusb"]
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index ef6bd9eaf3aa..0725f5e525ab 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -52,7 +52,7 @@ symlink = "0.1.0"
 tar = "0.4.37"
 tempfile = "3.2.0"
 thiserror = "1.0"
-zstd = "0.9.0"
+zstd = { version = "0.9.0", features = ["pkg-config"] }
 
 [lib]
 crate-type = ["lib"]
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
index 113db50d2894..d1619da6ba56 100644
--- a/storage-bigtable/Cargo.toml
+++ b/storage-bigtable/Cargo.toml
@@ -28,16 +28,8 @@ solana-storage-proto = { path = "../storage-proto", version = "=1.9.4" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.9.4" }
 thiserror = "1.0"
 tonic = { version = "0.6.1", features = ["tls", "transport"] }
-zstd = "0.9.0"
+zstd = { version = "0.9.0", features = ["pkg-config"] }
 
-# openssl is a dependency of the goauth and smpl_jwt crates, but explicitly
-# declare it here as well to activate the "vendored" feature that builds OpenSSL
-# statically...
-[target."cfg(not(windows))".dependencies]
-openssl = { version = "0.10", features = ["vendored"] }
-# ...except on Windows to avoid having to deal with getting CI past a build-time
-# Perl dependency
-[target."cfg(windows)".dependencies]
 openssl = { version = "0.10", features = [] }
 
 [lib]
-- 
2.33.1