From cdf9ee98287298e4620391d5bbb9cd1120a96da8 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Sun, 26 Apr 2020 08:03:43 -0700 Subject: revert #170 This caused fairly widespread problems and it seems that the original issue that led to this change (https://github.com/rust-lang/rust/issues/69552) should really be fixed by better defining the data exported from eg: libz-sys rather than having downstream crates replicating the same logic from inside that crate. refs: https://github.com/alexcrichton/ssh2-rs/issues/174 refs: https://github.com/alexcrichton/ssh2-rs/pull/170 refs: https://github.com/alexcrichton/ssh2-rs/issues/169 refs: https://github.com/rust-lang/rust/issues/69552 --- libssh2-sys/Cargo.toml | 2 +- libssh2-sys/build.rs | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml index eba4827..f57f5bd 100644 --- a/libssh2-sys/Cargo.toml +++ b/libssh2-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libssh2-sys" -version = "0.2.16" +version = "0.2.17" authors = ["Alex Crichton ", "Wez Furlong "] links = "ssh2" build = "build.rs" diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs index 57cf256..e63ed0a 100644 --- a/libssh2-sys/build.rs +++ b/libssh2-sys/build.rs @@ -124,10 +124,6 @@ fn main() { println!("cargo:rerun-if-env-changed=DEP_Z_INCLUDE"); if let Some(path) = env::var_os("DEP_Z_INCLUDE") { cfg.include(path); - } else if let Ok(lib) = pkg_config::find_library("zlib") { - for path in &lib.include_paths { - cfg.include(path); - } } println!("cargo:rerun-if-env-changed=DEP_OPENSSL_INCLUDE"); @@ -139,10 +135,6 @@ fn main() { } } } - } else if let Ok(lib) = pkg_config::find_library("openssl") { - for path in &lib.include_paths { - cfg.include(path); - } } let libssh2h = fs::read_to_string("libssh2/include/libssh2.h").unwrap(); -- cgit v1.2.3