From be446a866546d4d1a0b7b1b8022dcb41ad76641d Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Sat, 10 Dec 2022 06:37:16 -0800 Subject: [PATCH] fix(cli): use vendored openSSL (#5805) --- tooling/cli/Cargo.lock | 11 +++++++++++ tooling/cli/Cargo.toml | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 9858c5269..d904fb3fe 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -2579,6 +2579,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "111.24.0+1.1.1s" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.74" @@ -2588,6 +2597,7 @@ dependencies = [ "autocfg", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -3850,6 +3860,7 @@ dependencies = [ "notify", "notify-debouncer-mini", "once_cell", + "openssl", "os_info", "os_pipe", "regex", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index ebd0ae86d..377f65f25 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -92,5 +92,9 @@ winapi = { version = "0.3", features = [ "handleapi", "processenv", "winbase", " [target."cfg(unix)".dependencies] libc = "0.2" +[target.'cfg(target_os = "macos")'.dependencies] +# temporary fix, tauri-mobile should provide the openssl-vendored feature +openssl = { version = "0.10", features = ["vendored"] } + [profile.release] lto = true