|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
From d887c34ce5ec0d3b4228cf0f88e970f586abc845 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From d7c41e08d5fbe2b3e387ce363da71dd91f1db346 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
|
|
Date: Sun, 26 Nov 2017 12:22:51 +0100
|
|
|
|
|
Subject: [PATCH] build.rs: always use pkg-config
|
|
|
|
@ -10,10 +10,10 @@ Signed-off-by: Josh Stone <jistone@redhat.com>
|
|
|
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs
|
|
|
|
|
index cc76cd46b3b3..45c6ed61280d 100644
|
|
|
|
|
index 4586d56..3c531ef 100644
|
|
|
|
|
--- a/libgit2-sys/build.rs
|
|
|
|
|
+++ b/libgit2-sys/build.rs
|
|
|
|
|
@@ -10,14 +10,12 @@ fn main() {
|
|
|
|
|
@@ -7,14 +7,12 @@ fn main() {
|
|
|
|
|
let https = env::var("CARGO_FEATURE_HTTPS").is_ok();
|
|
|
|
|
let ssh = env::var("CARGO_FEATURE_SSH").is_ok();
|
|
|
|
|
|
|
|
|
@ -23,16 +23,16 @@ index cc76cd46b3b3..45c6ed61280d 100644
|
|
|
|
|
- for include in &lib.include_paths {
|
|
|
|
|
- println!("cargo:root={}", include.display());
|
|
|
|
|
- }
|
|
|
|
|
- return
|
|
|
|
|
- return;
|
|
|
|
|
+ let mut cfg = pkg_config::Config::new();
|
|
|
|
|
+ if let Ok(lib) = cfg.atleast_version("0.28.0").probe("libgit2") {
|
|
|
|
|
+ for include in &lib.include_paths {
|
|
|
|
|
+ println!("cargo:root={}", include.display());
|
|
|
|
|
}
|
|
|
|
|
+ return
|
|
|
|
|
+ return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !Path::new("libgit2/.git").exists() {
|
|
|
|
|
--
|
|
|
|
|
2.21.0
|
|
|
|
|
2.22.0
|
|
|
|
|
|
|
|
|
|