From nobody Sat Aug 10 10:51:33 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WgyJf08wDz5SZ96; Sat, 10 Aug 2024 10:51:46 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WgyJd3cs2z4t0Q; Sat, 10 Aug 2024 10:51:45 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723287105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ep7YGDij/0GJuxPl7JYT3bX71++WeJMy3OhN+LEM+yk=; b=wIbDSSbguUmCcn3QC52R+OgjJwTgI3bftoPt21uj9e8Cj/9Hk310JCnCJC7x/LZIVmlWPv 8J3FW0FWGA8SENC1Fho9GqAgs+8RBX4e8foBICBEEBbEjDpoV73wkG3MydLlyl0Bre+NKf PABUY7iRyGeA/c0e5rl5/wBUTVAmGpkImyLkumhQFWjaPgcFTisd//fUOSGp/oJtJ6wGlo ACzGDvyc5b5XkCAua8So8t+ICpq1IzMlmZJ24lJpoW5EXVYQ0DQE1HKWFv/PRTTRe6xoCf A6+j4XoIFotyLnT4xNdamZ6i+KquGLics6gBqIpbkOXe7Wg9pzOYnLORvXVmIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723287105; a=rsa-sha256; cv=none; b=Rt2DAM+8YJ7hSWWfKPNz6tS2LbHpzFe7uP0cWg6v6L9X2owVvlTb3wKHUsUfs2tuwMO+II BITD0TSLRvO7VPBSAv9vhfPoozKvtKgZ+bU+HupQMCMI7iiH2QE1ByT162OXzummVyBIB9 KU9tfbrgAx8+LhbPjecEhYb0SV+svPlhqd71Bax4hNrx3xR0obXzym/U+XhrAGkx2VAVjS OGYskPysD46ERrwuUgDjHTVU67YMABB0SLyilbqmbRhR49oUPtqQ+yN0nVPQQpLVZ789BT 1HABb7vmikYzL3KsMB5c75/9fLH22zLvvgI38ZxHp7fGotPaYI2IDvrT/M5OBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723287105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ep7YGDij/0GJuxPl7JYT3bX71++WeJMy3OhN+LEM+yk=; b=EQLJ7rLXToFFfEUyI68OlTZWzilOVnAHLPn0yexiQ3LZOGBcW8gV0epS84zPv2MobaS7tY EnWa31xC+ufOeOORtMYMwwHjI+AJJpYxtchSoHMO/6U4NCTnKgcShmuiE4ta3P2jIQ2Ujl KAIjpY8hBbVIILxjyhYAp5uzzMO1XoUS5PYINyT3N0MrY/gYQRusHievMflWqfAjFM9flF NdVF8gHTsPLzEsBupkVxo943EoWyS1s5dDxVUE1LhAm4SaxXONsISxbGgW3VgrT9gg3J4p sisOiS6SVZKy0Xr70wSOj/yDoVFINjj7KN49kxYfO6LaYRzCMZ3AK1qvXYYVYQ== Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4WgyJd35Drz17h3; Sat, 10 Aug 2024 10:51:45 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-44fe9aa3bfaso17746571cf.0; Sat, 10 Aug 2024 03:51:45 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXZj6tksOWmihITY0gkWK6nBjuhHc7WDOpD9TD68MsciGuZPFrr+KgcyPaaK666hjL2KrEb3TugbHviZ4248e+l+O05/hHUQUeL4AiG8CfTmosxZWKnnBW+wkNga4sPO8dsYfnNXUqSrqpqtfc56rfACcDO4HY= X-Gm-Message-State: AOJu0YxBmVn4991pLut9N4Ap6v3fdmJa9bkn7Fy3RPdb27Xcnu/VTRCW 46ypEOVqcTHgpM4QTrOerlWMZCj4gvWKWoZ2NJmjvGaYzNNlgHyDjloar+SSjT8JD4IrU53AF/O ZEbeOIuX2esM9fMBWETafoSp8+c8= X-Google-Smtp-Source: AGHT+IHxWHcXGARQYZJTxhwhEAcYJinrLM6ic52gggpfB9SDFwZqERdHC/vzfr5XIr2vOjtDkHW6mpj9z2snUGl30Ac= X-Received: by 2002:a05:622a:618c:b0:44f:f11a:63de with SMTP id d75a77b69052e-453126e7bcemr33408071cf.61.1723287104209; Sat, 10 Aug 2024 03:51:44 -0700 (PDT) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 References: <202408100042.47A0g2sI025873@gitrepo.freebsd.org> In-Reply-To: <202408100042.47A0g2sI025873@gitrepo.freebsd.org> From: Nuno Teixeira Date: Sat, 10 Aug 2024 11:51:33 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 84ce872284e3 - main - devel/cargo-c: unbreak build with libgit2 1.8.1 To: Jan Beich Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000b1549d061f520b38" --000000000000b1549d061f520b38 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Jan! This is the solution that I was looking for. I will use this patch on failing ports from same PR and check results. Thanks, Jan Beich escreveu (s=C3=A1bado, 10/08/2024 =C3=A0(s) = 01:42): > The branch main has been updated by jbeich: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D84ce872284e30424e2691199d4002= 3a852b13563 > > commit 84ce872284e30424e2691199d40023a852b13563 > Author: Jan Beich > AuthorDate: 2024-08-09 23:12:27 +0000 > Commit: Jan Beich > 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 > 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-2= 4 > 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 + /// Tries to use system libgit2 and emits necessary build script > instructions. > + fn try_system_libgit2() -> Result pkg_config::Error> { > + let mut cfg =3D 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) =3D> { > + for include in &lib.include_paths { > + println!("cargo:root=3D{}", include.display()); > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000b1549d061f520b38 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Jan!

This is the solut= ion that I was looking for.
I will use this patch on failing = ports from same PR and check results.

Thanks,

Ja= n Beich <jbeich@freebsd.org>= ; escreveu (s=C3=A1bado, 10/08/2024 =C3=A0(s) 01:42):
The branch main has been updated by j= beich:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D84ce872284e30424e2691199d40023a852b13563

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

=C2=A0 =C2=A0 devel/cargo-c: unbreak build with libgit2 1.8.1

=C2=A0 =C2=A0 warning: libgit2-sys@0.16.2+1.7.2: failed to probe system lib= git2:
=C2=A0 =C2=A0 [...]
=C2=A0 =C2=A0 warning: libgit2-sys@0.16.2+1.7.2: libgit2/src/libgit2/transp= orts/ssh.c:11:10: fatal error: 'libssh2.h' file not found
=C2=A0 =C2=A0 warning: libgit2-sys@0.16.2+1.7.2:=C2=A0 =C2=A0 11 | #include= <libssh2.h>
=C2=A0 =C2=A0 warning: libgit2-sys@0.16.2+1.7.2:=C2=A0 =C2=A0 =C2=A0 =C2=A0= |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^~~~~~~~~~~
=C2=A0 =C2=A0 warning: libgit2-sys@0.16.2+1.7.2: 1 error generated.

=C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0280706
=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 eduardo
---
=C2=A0devel/cargo-c/files/patch-libgit2-1.8.x | 13 +++++++++++++
=C2=A01 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/comm= it/b534e13f38c6
+
+--- cargo-crates/libgit2-sys-0.16.2+1.7.2/build.rs.orig=C2=A0 =C2=A0 =C2= =A0 =C2=A0 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::Librar= y,
+ /// Tries to use system libgit2 and emits necessary build script instruct= ions.
+ fn try_system_libgit2() -> Result<pkg_config::Library, pkg_config::= Error> {
+=C2=A0 =C2=A0 =C2=A0let mut cfg =3D pkg_config::Config::new();
+-=C2=A0 =C2=A0 match cfg.range_version("1.7.2".."1.8.0"= ;).probe("libgit2") {
++=C2=A0 =C2=A0 match cfg.range_version("1.7.2".."1.9.0"= ;).probe("libgit2") {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Ok(lib) =3D> {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0for include in &lib.in= clude_paths {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0println!(&qu= ot;cargo:root=3D{}", include.display());


--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000b1549d061f520b38--