Browse Source

fix musl non-TLS build (#365)

Arnie97 1 year ago
parent
commit
be14d124a2
2 changed files with 27 additions and 9 deletions
  1. 26 8
      Cargo.lock
  2. 1 1
      Cargo.toml

+ 26 - 8
Cargo.lock

@@ -511,9 +511,12 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 
 [[package]]
 [[package]]
 name = "deranged"
 name = "deranged"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
 
 
 [[package]]
 [[package]]
 name = "des"
 name = "des"
@@ -1243,6 +1246,12 @@ dependencies = [
  "winapi",
  "winapi",
 ]
 ]
 
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 [[package]]
 name = "num-traits"
 name = "num-traits"
 version = "0.2.16"
 version = "0.2.16"
@@ -1317,9 +1326,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 
 [[package]]
 [[package]]
 name = "openssl-src"
 name = "openssl-src"
-version = "300.2.3+3.2.1"
+version = "300.3.1+3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
 dependencies = [
 dependencies = [
  "cc",
  "cc",
 ]
 ]
@@ -1462,6 +1471,12 @@ dependencies = [
  "universal-hash",
  "universal-hash",
 ]
 ]
 
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 [[package]]
 name = "ppv-lite86"
 name = "ppv-lite86"
 version = "0.2.17"
 version = "0.2.17"
@@ -2079,12 +2094,14 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "time"
 name = "time"
-version = "0.3.29"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
 dependencies = [
  "deranged",
  "deranged",
  "itoa",
  "itoa",
+ "num-conv",
+ "powerfmt",
  "serde",
  "serde",
  "time-core",
  "time-core",
  "time-macros",
  "time-macros",
@@ -2098,10 +2115,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 
 [[package]]
 [[package]]
 name = "time-macros"
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
 dependencies = [
+ "num-conv",
  "time-core",
  "time-core",
 ]
 ]
 
 

+ 1 - 1
Cargo.toml

@@ -127,7 +127,7 @@ rustls-pemfile = { version = "2.0", optional = true }
 p12 = { version = "0.6.3", optional = true }
 p12 = { version = "0.6.3", optional = true }
 
 
 [target.'cfg(target_env = "musl")'.dependencies]
 [target.'cfg(target_env = "musl")'.dependencies]
-openssl = { version = "0.10", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"], optional = true }
 
 
 [build-dependencies]
 [build-dependencies]
 vergen = { version = "7.4.2", default-features = false, features = [
 vergen = { version = "7.4.2", default-features = false, features = [