Date: Mon, 30 Mar 2020 15:06:49 +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: r529892 - head/devel/gitlab-runner/files Message-ID: <202003301506.02UF6nr2085084@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mikael Date: Mon Mar 30 15:06:49 2020 New Revision: 529892 URL: https://svnweb.freebsd.org/changeset/ports/529892 Log: devel/gitlab-runner: fix patch files The patch were applied twice. Reported by: mfechner Approved by: manu (mentor, implicit) Modified: head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Modified: head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go ============================================================================== --- head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go Mon Mar 30 14:56:20 2020 (r529891) +++ head/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go Mon Mar 30 15:06:49 2020 (r529892) @@ -14,19 +14,3 @@ + 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 -+} Modified: head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go ============================================================================== --- head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Mon Mar 30 14:56:20 2020 (r529891) +++ head/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Mon Mar 30 15:06:49 2020 (r529892) @@ -22,27 +22,3 @@ Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> 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?202003301506.02UF6nr2085084>