diff --git a/Cargo.lock b/Cargo.lock index cb108eda0..8215b7588 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1654,6 +1654,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +[[package]] +name = "openssl-src" +version = "111.10.2+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.58" @@ -1663,6 +1672,7 @@ dependencies = [ "autocfg 1.0.0", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -2506,6 +2516,7 @@ dependencies = [ "dotenv", "futures 0.3.5", "glob", + "openssl", "serde", "serde_json", "sqlx", diff --git a/sqlx-cli/Cargo.toml b/sqlx-cli/Cargo.toml index 1540d7f67..76ea2e8e8 100644 --- a/sqlx-cli/Cargo.toml +++ b/sqlx-cli/Cargo.toml @@ -40,6 +40,7 @@ serde_json = { version = "1.0.53", features = ["preserve_order"] } serde = "1.0.110" glob = "0.3.0" cargo_metadata = "0.10.0" +openssl = { version = "0.10.30", optional = true } [features] default = [ "postgres", "sqlite", "mysql" ] @@ -48,3 +49,6 @@ default = [ "postgres", "sqlite", "mysql" ] mysql = [ "sqlx/mysql" ] postgres = [ "sqlx/postgres" ] sqlite = [ "sqlx/sqlite" ] + +# workaround for musl + openssl issues +openssl-vendored = [ "openssl/vendored" ]