Merge #147

147: Re-introduce custom_* features for mbedtls-sys backcompat r=raoulstrackx a=jethrogb



Co-authored-by: Jethro Beekman <[email protected]>

Author: bors[bot]

mbedtls-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mbedtls-sys-auto"
-version = "2.25.1"
+version = "2.25.2"
 authors = ["Jethro Beekman <[email protected]>"]
 build = "build/build.rs"
 license = "Apache-2.0/GPL-2.0+"
@@ -55,8 +55,9 @@ padlock = []
 legacy_protocols = []
 mpi_force_c_code = []
 trusted_cert_callback = []
-# deprecated features, these don't do anything anymore, can be removed on major version bump
+# deprecated, needed for backcompat, can be removed on major version bump
 custom_threading = ["threading"]
-pthread = ["threading"]
 custom_time = ["time"]
 custom_gmtime_r = ["time"]
+# deprecated features, these don't do anything anymore, can be removed on major version bump
+pthread = ["threading"]

mbedtls-sys/build/features.rs

@@ -28,13 +28,17 @@ impl Features {
         }
         self.automatic_features.insert("c_compiler");
 
+        // deprecated, needed for backcompat
+        let have_custom_threading = self.have_feature("custom_threading");
+        let have_custom_gmtime_r = self.have_feature("custom_gmtime_r");
+
         if !self.have_feature("std") ||
             env_have_target_cfg("env", "sgx") ||
             env_have_target_cfg("os", "none") {
             self.with_feature("c_compiler").unwrap().insert("freestanding");
         }
         if let Some(components) = self.with_feature("threading") {
-            if env_have_target_cfg("family", "unix") {
+            if !have_custom_threading && env_have_target_cfg("family", "unix") {
                 components.insert("pthread");
             } else {
                 components.insert("custom");
@@ -48,7 +52,7 @@ impl Features {
             }
         }
         if let Some(components) = self.with_feature("time") {
-            if env_have_target_cfg("family", "unix") {
+            if !have_custom_gmtime_r && env_have_target_cfg("family", "unix") {
                 components.insert("libc");
             } else {
                 components.insert("custom");