From a29ab5dae04b040e8065d061c2891a8f0c57e6a1 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Mon, 10 Aug 2020 18:51:22 +0000 Subject: [PATCH] bug: remove ubuntu target for grpcio Closes #774 --- Cargo.toml | 6 +++--- README.md | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8fe30388d3..59629594b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,6 +34,9 @@ env_logger = "0.7.1" failure = "0.1.8" futures = { version = "0.3", features = ["compat"] } googleapis-raw = { version = "0", path = "vendor/mozilla-rust-sdk/googleapis-raw" } +# Some versions of OpenSSL 1.1.1 conflict with grpcio's built-in boringssl which can cause +# syncserver to either fail to either compile, or start. In those cases, try +# `cargo build --features grpcio/openssl ...` grpcio = { version = "0.6.0" } lazy_static = "1.4.0" hawk = "3.2" @@ -68,9 +71,6 @@ validator = "0.10" validator_derive = "0.10" woothee = "0.11" -[target.'cfg(target_vendor="ubuntu")'.dependencies] -grpcio = { version="0.6", features=["openssl"] } - [dev-dependencies] tokio = { version = "0.2", features = ["macros"] } diff --git a/README.md b/README.md index e14433c665..256098474d 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ This requires access to the mozilla-rust-sdk which is now available at `/vendor/ ### Connecting to Firefox -This will walk you through the steps to connect this project to your local copy of Firefox. +This will walk you through the steps to connect this project to your local copy of Firefox. 1. Follow the steps outlined above for running this project using [MySQL](https://github.com/mozilla-services/syncstorage-rs#mysql). @@ -201,11 +201,13 @@ Open a PR after doing the following: Once your PR merges, then go ahead and create an official [GitHub release](https://github.com/mozilla-services/syncstorage-rs/releases). - ## Troubleshooting - `rm Cargo.lock; cargo clean;` - Try this if you're having problems compiling. +- Some versions of OpenSSL 1.1.1 can conflict with grpcio's built in BoringSSL. These errors can cause syncstorage to fail to run or compile. +If you see a problem related to `libssl` you may need to specify the `cargo` option `--features grpcio/openssl` to force grpcio to use OpenSSL. + ## Related Documentation - [API docs](https://mozilla-services.readthedocs.io/en/latest/storage/apis-1.5.html)