aboutsummaryrefslogtreecommitdiff
path: root/devel/gitlab-runner
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2020-03-30 15:06:49 +0000
committerMikael Urankar <mikael@FreeBSD.org>2020-03-30 15:06:49 +0000
commitba5540d80e7ae48f4471a904cbd9f3e3cf0c4cc8 (patch)
treef49d32ea3e6b7f1cbec4fdce61611c86b88153f8 /devel/gitlab-runner
parent8f07bc85f3eb4968733b765013540e34dc30965c (diff)
downloadports-ba5540d80e7ae48f4471a904cbd9f3e3cf0c4cc8.tar.gz
ports-ba5540d80e7ae48f4471a904cbd9f3e3cf0c4cc8.zip
devel/gitlab-runner: fix patch files
The patch were applied twice. Reported by: mfechner Approved by: manu (mentor, implicit)
Notes
Notes: svn path=/head/; revision=529892
Diffstat (limited to 'devel/gitlab-runner')
-rw-r--r--devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go16
-rw-r--r--devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go24
2 files changed, 0 insertions, 40 deletions
diff --git a/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go b/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go
index 22ac7b2b88a0..172bf5328fbc 100644
--- a/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go
+++ b/devel/gitlab-runner/files/patch-vendor_github.com_kr_pty_ztypes__freebsd__arm64.go
@@ -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
-+}
diff --git a/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
index 4d66152a9124..0e0603b77cee 100644
--- a/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
+++ b/devel/gitlab-runner/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
@@ -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
- }