From: Vasudev Kamath Date: Sun, 3 Dec 2017 13:46:00 +0000 (+0530) Subject: Refresh patch 2001 to new libgit2-sys release. X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~123 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=294f553e259db5f9855e6cfac6d4bc1b515721d4;p=cargo.git Refresh patch 2001 to new libgit2-sys release. --- diff --git a/debian/patches/2001_use-system-libgit2.patch b/debian/patches/2001_use-system-libgit2.patch index 7169d3f67..47ba46a37 100644 --- a/debian/patches/2001_use-system-libgit2.patch +++ b/debian/patches/2001_use-system-libgit2.patch @@ -3,18 +3,18 @@ Author: Ximin Luo Forwarded: not-needed --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/vendor/libgit2-sys-0.6.12/build.rs -+++ b/vendor/libgit2-sys-0.6.12/build.rs -@@ -31,10 +31,8 @@ - } - let has_pkgconfig = Command::new("pkg-config").output().is_ok(); - -- if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() { -- if pkg_config::find_library("libgit2").is_ok() { -- return -- } -+ if pkg_config::find_library("libgit2").is_ok() { -+ return - } - - if !Path::new("libgit2/.git").exists() { +--- a/vendor/libgit2-sys-0.6.16/build.rs ++++ b/vendor/libgit2-sys-0.6.16/build.rs +@@ -31,10 +31,9 @@ + } + let has_pkgconfig = Command::new("pkg-config").output().is_ok(); + +- if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() { +- if pkg_config::find_library("libgit2").is_ok() { ++ ++ if pkg_config::find_library("libgit2").is_ok() { + return +- } + } + + if !Path::new("libgit2/.git").exists() {