Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Aug 2024 00:42:02 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: 84ce872284e3 - main - devel/cargo-c: unbreak build with libgit2 1.8.1
Message-ID:  <202408100042.47A0g2sI025873@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=84ce872284e30424e2691199d40023a852b13563

commit 84ce872284e30424e2691199d40023a852b13563
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-08-09 23:12:27 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-08-10 00:41:35 +0000

    devel/cargo-c: unbreak build with libgit2 1.8.1
    
    warning: libgit2-sys@0.16.2+1.7.2: failed to probe system libgit2:
    [...]
    warning: libgit2-sys@0.16.2+1.7.2: libgit2/src/libgit2/transports/ssh.c:11:10: fatal error: 'libssh2.h' file not found
    warning: libgit2-sys@0.16.2+1.7.2:    11 | #include <libssh2.h>
    warning: libgit2-sys@0.16.2+1.7.2:       |          ^~~~~~~~~~~
    warning: libgit2-sys@0.16.2+1.7.2: 1 error generated.
    
    PR:             280706
    Reported by:    eduardo
---
 devel/cargo-c/files/patch-libgit2-1.8.x | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/devel/cargo-c/files/patch-libgit2-1.8.x b/devel/cargo-c/files/patch-libgit2-1.8.x
new file mode 100644
index 000000000000..b0ec8036a466
--- /dev/null
+++ b/devel/cargo-c/files/patch-libgit2-1.8.x
@@ -0,0 +1,13 @@
+https://github.com/rust-lang/git2-rs/commit/b534e13f38c6
+
+--- cargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs.orig	2006-07-24 01:21:28 UTC
++++ cargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs
+@@ -7,7 +7,7 @@ fn try_system_libgit2() -> Result<pkg_config::Library,
+ /// Tries to use system libgit2 and emits necessary build script instructions.
+ fn try_system_libgit2() -> Result<pkg_config::Library, pkg_config::Error> {
+     let mut cfg = pkg_config::Config::new();
+-    match cfg.range_version("1.7.2".."1.8.0").probe("libgit2") {
++    match cfg.range_version("1.7.2".."1.9.0").probe("libgit2") {
+         Ok(lib) => {
+             for include in &lib.include_paths {
+                 println!("cargo:root={}", include.display());



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408100042.47A0g2sI025873>