Add patch for libssh2-sys
Ximin Luo
5 years ago
|
0 |
Description: Use libssh2 from system by default
|
|
1 |
Author: Vasudev Kamath <vasudev@copyninja.info>
|
|
2 |
Bug: https://github.com/alexcrichton/ssh2-rs/issues/88
|
|
3 |
Forwarded: not-needed
|
|
4 |
Last-Update: 2018-07-28
|
|
5 |
|
|
6 |
--- a/build.rs
|
|
7 |
+++ b/build.rs
|
|
8 |
@@ -21,19 +21,20 @@
|
|
9 |
// The system copy of libssh2 is not used by default because it
|
|
10 |
// can lead to having two copies of libssl loaded at once.
|
|
11 |
// See https://github.com/alexcrichton/ssh2-rs/pull/88
|
|
12 |
- if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() {
|
|
13 |
- if let Ok(lib) = pkg_config::find_library("libssh2") {
|
|
14 |
- for path in &lib.include_paths {
|
|
15 |
- println!("cargo:include={}", path.display());
|
|
16 |
- }
|
|
17 |
- return
|
|
18 |
+ // if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() {
|
|
19 |
+ if let Ok(lib) = pkg_config::find_library("libssh2") {
|
|
20 |
+ for path in &lib.include_paths {
|
|
21 |
+ println!("cargo:include={}", path.display());
|
|
22 |
}
|
|
23 |
+ return;
|
|
24 |
}
|
|
25 |
+ // }
|
|
26 |
|
|
27 |
- if !Path::new("libssh2/.git").exists() {
|
|
28 |
- let _ = Command::new("git").args(&["submodule", "update", "--init"])
|
|
29 |
- .status();
|
|
30 |
- }
|
|
31 |
+ // if !Path::new("libssh2/.git").exists() {
|
|
32 |
+ // let _ = Command::new("git")
|
|
33 |
+ // .args(&["submodule", "update", "--init"])
|
|
34 |
+ // .status();
|
|
35 |
+ // }
|
|
36 |
|
|
37 |
let mut cfg = cmake::Config::new("libssh2");
|
|
38 |
|
|
0 |
no-special-snowflake-env.patch
|