Date: Fri, 27 Mar 2020 17:14:02 +0000 (UTC) From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529268 - head/devel/gitlab-runner/files Message-ID: <202003271714.02RHE2Gr068059@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mikael Date: Fri Mar 27 17:14:02 2020 New Revision: 529268 URL: https://svnweb.freebsd.org/changeset/ports/529268 Log: devel/gitlab-runner: unbreak on aarch64 # github.com/kr/pty vendor/github.com/kr/pty/pty_freebsd.go:50:20: undefined: fiodgnameArg vendor/github.com/kr/pty/pty_freebsd.go:63:12: undefined: _C_SPECNAMELEN vendor/github.com/kr/pty/pty_freebsd.go:66:9: undefined: fiodgnameArg Add the missing ztypes_freebsd_arm64.go file for aarch64 # golang.org/x/sys/unix vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go:400:12: undefined: uint128 Import upstream patch https://github.com/golang/sys/commit/33540a1f603772f9d4b761f416f5c10dade23e96 PR: 245012 Approved by: swills (maintainer), manu (mentor, implicit) Added: head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go (contents, props changed) head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go (contents, props changed) Added: head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go Fri Mar 27 17:14:02 2020 (r529268) @@ -0,0 +1,32 @@ +--- vendor/github.com/kr/pty/ztypes_freebsd_arm64.go.orig 2019-12-23 19:57:30 UTC ++++ vendor/github.com/kr/pty/ztypes_freebsd_arm64.go +@@ -0,0 +1,13 @@ ++// Created by cgo -godefs - DO NOT EDIT ++// cgo -godefs types_freebsd.go ++ ++package pty ++ ++const ( ++ _C_SPECNAMELEN = 0x3f ++) ++ ++type fiodgnameArg struct { ++ Len int32 ++ Buf *byte ++} +--- vendor/github.com/kr/pty/ztypes_freebsd_arm64.go.orig 2019-12-23 19:57:30 UTC ++++ vendor/github.com/kr/pty/ztypes_freebsd_arm64.go +@@ -0,0 +1,13 @@ ++// Created by cgo -godefs - DO NOT EDIT ++// cgo -godefs types_freebsd.go ++ ++package pty ++ ++const ( ++ _C_SPECNAMELEN = 0x3f ++) ++ ++type fiodgnameArg struct { ++ Len int32 ++ Buf *byte ++} Added: head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Fri Mar 27 17:14:02 2020 (r529268) @@ -0,0 +1,48 @@ +From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001 +From: Tobias Klauser <tklauser@distanz.ch> +Date: Fri, 25 Oct 2019 21:13:51 +0200 +Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64 + +CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a +type uint128. This type doesn't exist in Go. + +Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b +Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419 +Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> +TryBot-Result: Gobot Gobot <gobot@golang.org> +Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> +--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig 2019-08-18 13:42:05 UTC ++++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go +@@ -397,7 +397,7 @@ type Reg struct { + } + + type FpReg struct { +- Fp_q [32]uint128 ++ Fp_q [512]uint8 + Fp_sr uint32 + Fp_cr uint32 + } +From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001 +From: Tobias Klauser <tklauser@distanz.ch> +Date: Fri, 25 Oct 2019 21:13:51 +0200 +Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64 + +CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a +type uint128. This type doesn't exist in Go. + +Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b +Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419 +Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> +TryBot-Result: Gobot Gobot <gobot@golang.org> +Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> +--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig 2019-08-18 13:42:05 UTC ++++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go +@@ -397,7 +397,7 @@ type Reg struct { + } + + type FpReg struct { +- Fp_q [32]uint128 ++ Fp_q [512]uint8 + Fp_sr uint32 + Fp_cr uint32 + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003271714.02RHE2Gr068059>