From 0a529b5347f08f6ef7950269bca5220226ec8d2e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 1 Apr 2020 09:55:51 -0700 Subject: [PATCH] Update to libgit2's 1.0.0 release * Enable pkg-config by default now that it has a stable ABI * Bump libgit2-sys version number --- libgit2-sys/Cargo.toml | 2 +- libgit2-sys/build.rs | 12 +++++------- libgit2-sys/libgit2 | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml index f0b2604a09..03d9db59f9 100644 --- a/libgit2-sys/Cargo.toml +++ b/libgit2-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libgit2-sys" -version = "0.12.1+0.99.0" +version = "0.12.2+1.0.0" authors = ["Josh Triplett ", "Alex Crichton "] links = "git2" build = "build.rs" diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs index 25a16a3885..54601bfbb9 100644 --- a/libgit2-sys/build.rs +++ b/libgit2-sys/build.rs @@ -7,14 +7,12 @@ fn main() { let https = env::var("CARGO_FEATURE_HTTPS").is_ok(); let ssh = env::var("CARGO_FEATURE_SSH").is_ok(); - if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() { - 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; + let mut cfg = pkg_config::Config::new(); + if let Ok(lib) = cfg.atleast_version("1.0.0").probe("libgit2") { + for include in &lib.include_paths { + println!("cargo:root={}", include.display()); } + return; } if !Path::new("libgit2/.git").exists() { diff --git a/libgit2-sys/libgit2 b/libgit2-sys/libgit2 index be36db28f6..7d3c7057f0 160000 --- a/libgit2-sys/libgit2 +++ b/libgit2-sys/libgit2 @@ -1 +1 @@ -Subproject commit be36db28f64de8ed5ca9870708a56b6668c6c482 +Subproject commit 7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0