Date: Tue, 6 Apr 2021 08:15:07 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f990e2b38bff - main - devel/cargo-c: drop libgit2 < 1.1 workaround after e7d94d42f82e Message-ID: <202104060815.1368F7qP090732@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f990e2b38bff59c5ff31969f3ab9c64ae47d6728 commit f990e2b38bff59c5ff31969f3ab9c64ae47d6728 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-04-06 07:54:52 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-04-06 08:11:38 +0000 devel/cargo-c: drop libgit2 < 1.1 workaround after e7d94d42f82e --- devel/cargo-c/files/patch-libgit2-1.0 | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/devel/cargo-c/files/patch-libgit2-1.0 b/devel/cargo-c/files/patch-libgit2-1.0 deleted file mode 100644 index 91f08cd36de1..000000000000 --- a/devel/cargo-c/files/patch-libgit2-1.0 +++ /dev/null @@ -1,21 +0,0 @@ -Revert https://github.com/rust-lang/git2-rs/commit/b830b24c8f70 -until devel/libgit2 is updated to 1.1.0 - -warning: libgit2/src/transports/ssh.c:11:10: fatal error: 'libssh2.h' file not found -warning: #include <libssh2.h> -warning: ^~~~~~~~~~~ -warning: 1 error generated. - -error: failed to run custom build command for `libgit2-sys v0.12.15+1.1.0` - ---- cargo-crates/libgit2-sys-0.12.18+1.1.0/build.rs.orig 2020-12-18 15:47:36 UTC -+++ cargo-crates/libgit2-sys-0.12.18+1.1.0/build.rs -@@ -12,7 +12,7 @@ fn main() { - // To use zlib-ng in zlib-compat mode, we have to build libgit2 ourselves. - if !zlib_ng_compat { - let mut cfg = pkg_config::Config::new(); -- if let Ok(lib) = cfg.atleast_version("1.1.0").probe("libgit2") { -+ if let Ok(lib) = cfg.atleast_version("1.0.1").probe("libgit2") { - for include in &lib.include_paths { - println!("cargo:root={}", include.display()); - }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104060815.1368F7qP090732>