diff --git a/Cargo.lock b/Cargo.lock index 59f837e6..fb425cca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -302,6 +302,7 @@ dependencies = [ "blend-db", "blend-web", "clap", + "openssl", "thiserror", "tokio", "tracing", @@ -1527,6 +1528,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.102" @@ -1535,6 +1545,7 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml index 41615a64..af15d642 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ blend-context = { path = "./crates/blend-context" } blend-db = { path = "./crates/blend-db" } blend-web = { path = "./crates/blend-web" } clap = { version = "4", features = ["derive"] } +openssl = { version = "0", features = ["vendored"] } thiserror = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing = { workspace = true } @@ -40,17 +41,11 @@ opt-level = 1 opt-level = 3 [package.metadata.cross.target.aarch64-unknown-linux-gnu] -env.passthrough = ["DATABASE_URL", "RUSTFLAGS"] -pre-build = [ - "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update", - "apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH", -] +env.passthrough = ["DATABASE_URL"] [package.metadata.cross.target.aarch64-unknown-linux-musl] -env.passthrough = ["DATABASE_URL", "RUSTFLAGS", "TARGET_CC=gcc"] +env.passthrough = ["DATABASE_URL"] image = "messense/rust-musl-cross:aarch64-musl" -pre-build = ["apt-get update", "apt-get install --assume-yes libssl-dev"] [profile.release] strip = true