Date: Fri, 12 Jan 2024 17:02:05 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1ea4180eb766 - main - net-im/libsignal-node: Fix build when git isn't installed Message-ID: <202401121702.40CH25RE010289@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ea4180eb7662ef71b495dc4b066cc0bf9b21087 commit 1ea4180eb7662ef71b495dc4b066cc0bf9b21087 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2024-01-12 17:00:27 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2024-01-12 17:01:53 +0000 net-im/libsignal-node: Fix build when git isn't installed Git is not mandatory as we can use the 'patch' utility --- .../libsignal-node/files/patch-boring_boring-sys_build.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs b/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs index 7ac2bddcd13c..6d9edb6ae629 100644 --- a/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs +++ b/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs @@ -1,5 +1,18 @@ --- ../boring-8245063ae6eb97d909982b89fad45bb7f0a2a1a0/boring-sys/build.rs.orig 2024-01-05 10:45:46 UTC +++ ../boring-8245063ae6eb97d909982b89fad45bb7f0a2a1a0/boring-sys/build.rs +@@ -456,9 +456,9 @@ fn ensure_patches_applied() -> io::Result<()> { + lock_file.lock()?; + + // NOTE: init git in the copied files, so we can apply patches +- if !has_git { +- run_command(Command::new("git").args(["init"]).current_dir(&src_path))?; +- } ++// if !has_git { ++// run_command(Command::new("git").args(["init"]).current_dir(&src_path))?; ++// } + + if cfg!(feature = "pq-experimental") { + println!("cargo:warning=applying experimental post quantum crypto patch to boringssl"); @@ -482,11 +482,9 @@ fn apply_patch(patch_name: &str) -> io::Result<()> { .canonicalize()?;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401121702.40CH25RE010289>