diff options
| author | Wez Furlong <wez@wezfurlong.org> | 2020-04-26 08:03:43 -0700 |
|---|---|---|
| committer | Wez Furlong <wez@wezfurlong.org> | 2020-04-26 08:03:43 -0700 |
| commit | cdf9ee98287298e4620391d5bbb9cd1120a96da8 (patch) | |
| tree | 087486412e84291eff90d26d81657ed148e37291 | |
| parent | 9391b90de907c321d786da0202b1b1d84de066ee (diff) | |
| download | ssh2-rs-cdf9ee98287298e4620391d5bbb9cd1120a96da8.zip | |
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
| -rw-r--r-- | libssh2-sys/Cargo.toml | 2 | ||||
| -rw-r--r-- | libssh2-sys/build.rs | 8 |
2 files changed, 1 insertions, 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 <alex@alexcrichton.com>", "Wez Furlong <wez@wezfurlong.org>"] 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(); |