Re: git: e665c2bc9970 - main - devel/gitaly: fix build on armv7
- In reply to: Robert Clausecker : "git: e665c2bc9970 - main - devel/gitaly: fix build on armv7"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 May 2026 05:47:28 UTC
Dear Robert,
thanks a lot for your fixes.
Do you want to provide them upstream (they are very open to accept patches)?
Ask here for fixes in:
devel/gitaly
www/gitlab-workhorse
Thanks
Matthias
Am 02.05.26 um 02:56 schrieb Robert Clausecker:
> The branch main has been updated by fuz:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=e665c2bc9970aebba5a2a021092b0ca753204f84
>
> commit e665c2bc9970aebba5a2a021092b0ca753204f84
> Author: Robert Clausecker <fuz@FreeBSD.org>
> AuthorDate: 2026-05-02 00:18:46 +0000
> Commit: Robert Clausecker <fuz@FreeBSD.org>
> CommitDate: 2026-05-02 00:32:42 +0000
>
> devel/gitaly: fix build on armv7
>
> Apparently these are not int64 on 32-bit platforms.
>
> Approved by: portmgr (build fix blanket)
> MFH: 2026Q2
> ---
> devel/gitaly/files/patch-internal_command_command.go | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/devel/gitaly/files/patch-internal_command_command.go b/devel/gitaly/files/patch-internal_command_command.go
> new file mode 100644
> index 000000000000..91ea4f00a910
> --- /dev/null
> +++ b/devel/gitaly/files/patch-internal_command_command.go
> @@ -0,0 +1,17 @@
> +--- internal/command/command.go.orig 2026-05-02 00:01:37 UTC
> ++++ internal/command/command.go
> +@@ -738,10 +738,10 @@ func (c *Command) logProcessComplete() {
> +
> + if ok {
> + attributes = append(attributes,
> +- attribute.Int64("inblock", rusage.Inblock),
> +- attribute.Int64("oublock", rusage.Oublock),
> +- attribute.Int64("minflt", rusage.Minflt),
> +- attribute.Int64("majflt", rusage.Majflt),
> ++ attribute.Int64("inblock", int64(rusage.Inblock)),
> ++ attribute.Int64("oublock", int64(rusage.Oublock)),
> ++ attribute.Int64("minflt", int64(rusage.Minflt)),
> ++ attribute.Int64("majflt", int64(rusage.Majflt)),
> + )
> + }
> + attributes = append(attributes, attribute.Int64("maxrssanon_bytes", c.maxRssAnon.Load()))
>