From 7bed7a62a195fe146283c286c220fcf506f00c97 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Tue, 7 Aug 2018 22:14:46 +0530 Subject: [PATCH] Use libssh2 from system by default Bug: https://github.com/alexcrichton/ssh2-rs/issues/88 Forwarded: not-needed Last-Update: 2018-07-28 Gbp-Pq: Name 2003_force-use-system-libssh2.patch --- vendor/libssh2-sys-0.2.8/build.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/vendor/libssh2-sys-0.2.8/build.rs b/vendor/libssh2-sys-0.2.8/build.rs index 1f5ed1ac4..5a33c4f8b 100644 --- a/vendor/libssh2-sys-0.2.8/build.rs +++ b/vendor/libssh2-sys-0.2.8/build.rs @@ -21,19 +21,20 @@ fn main() { // The system copy of libssh2 is not used by default because it // can lead to having two copies of libssl loaded at once. // See https://github.com/alexcrichton/ssh2-rs/pull/88 - if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() { - if let Ok(lib) = pkg_config::find_library("libssh2") { - for path in &lib.include_paths { - println!("cargo:include={}", path.display()); - } - return + // if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() { + if let Ok(lib) = pkg_config::find_library("libssh2") { + for path in &lib.include_paths { + println!("cargo:include={}", path.display()); } + return; } + // } - if !Path::new("libssh2/.git").exists() { - let _ = Command::new("git").args(&["submodule", "update", "--init"]) - .status(); - } + // if !Path::new("libssh2/.git").exists() { + // let _ = Command::new("git") + // .args(&["submodule", "update", "--init"]) + // .status(); + // } let mut cfg = cmake::Config::new("libssh2"); -- 2.30.2