Skip to content

Commit 654537a

Browse files
remove feature flags, use native-certs by default
1 parent a28f048 commit 654537a

File tree

3 files changed

+8
-23
lines changed

3 files changed

+8
-23
lines changed

openblas-build/Cargo.toml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,15 @@ repository = "https://github.com/blas-lapack-rs/openblas-src"
1111
readme = "../README.md"
1212
exclude = ["test_build/"]
1313

14-
[features]
15-
default = ["tls"]
16-
17-
tls = ["ureq/tls", "ureq/gzip"]
18-
native-certs = [
19-
"native-tls",
20-
"ureq/native-certs",
21-
"ureq/native-tls",
22-
"ureq/gzip",
23-
]
24-
2514
[dependencies]
2615
anyhow = "1.0.68"
2716
flate2 = "1.0.25"
2817
tar = "0.4.38"
2918
thiserror = "1.0.22"
30-
ureq = { version = "2.5.0", default-features = false }
31-
native-tls = { version = "0.2.11", optional = true }
19+
ureq = { version = "2.5.0", default-features = false, features = [
20+
"native-certs",
21+
"native-tls",
22+
"gzip",
23+
] }
24+
native-tls = { version = "0.2.11" }
3225
walkdir = "2.3.1"

openblas-build/src/download.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,10 @@ pub fn download(out_dir: &Path) -> Result<PathBuf> {
2525
Ok(dest)
2626
}
2727

28-
#[cfg(feature = "native-tls")]
2928
fn get_agent() -> ureq::Agent {
3029
ureq::AgentBuilder::new()
3130
.tls_connector(std::sync::Arc::new(
3231
native_tls::TlsConnector::new().expect("failed to create TLS connector"),
3332
))
3433
.build()
3534
}
36-
37-
#[cfg(not(feature = "native-tls"))]
38-
fn get_agent() -> ureq::Agent {
39-
ureq::agent()
40-
}

openblas-src/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,20 @@ build = "build.rs"
2424
links = "openblas"
2525

2626
[features]
27-
default = ["cblas", "lapacke", "tls"]
27+
default = ["cblas", "lapacke"]
2828

2929
cache = []
3030
cblas = []
3131
lapacke = []
3232
static = []
3333
system = []
34-
tls = ["openblas-build/tls"]
35-
native-certs = ["openblas-build/native-certs"]
3634

3735
[dev-dependencies]
3836
libc = "0.2"
3937

4038
[build-dependencies]
4139
dirs = "3.0.1"
42-
openblas-build = { version = "0.10.7", path = "../openblas-build", default-features = false }
40+
openblas-build = { version = "0.10.7", path = "../openblas-build" }
4341

4442
[target.'cfg(target_os="windows")'.build-dependencies]
4543
vcpkg = "0.2"

0 commit comments

Comments
 (0)