From owner-svn-ports-head@freebsd.org Thu Mar 26 11:24:37 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 30D2627BE68; Thu, 26 Mar 2020 11:24:37 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48p2h13Vzfz3Hrb; Thu, 26 Mar 2020 11:24:31 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AAA7C520F; Thu, 26 Mar 2020 11:24:24 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02QBOOLE090689; Thu, 26 Mar 2020 11:24:24 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QBOO9Q090687; Thu, 26 Mar 2020 11:24:24 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202003261124.02QBOO9Q090687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Thu, 26 Mar 2020 11:24:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529175 - head/net/concourse-fly/files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: head/net/concourse-fly/files X-SVN-Commit-Revision: 529175 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 11:24:37 -0000 Author: mikael Date: Thu Mar 26 11:24:23 2020 New Revision: 529175 URL: https://svnweb.freebsd.org/changeset/ports/529175 Log: net/concourse-fly: unbreak on aarch64 # github.com/creack/pty vendor/github.com/creack/pty/pty_freebsd.go:50:20: undefined: fiodgnameArg vendor/github.com/creack/pty/pty_freebsd.go:63:12: undefined: _C_SPECNAMELEN vendor/github.com/creack/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: 245058 Approved by: dumbbell (maintainer), manu (mentor, implicit) Added: head/net/concourse-fly/files/ head/net/concourse-fly/files/patch-vendor_github.com_creack_pty_ztypes__freebsd__arm64.go (contents, props changed) head/net/concourse-fly/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go (contents, props changed) Added: head/net/concourse-fly/files/patch-vendor_github.com_creack_pty_ztypes__freebsd__arm64.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/concourse-fly/files/patch-vendor_github.com_creack_pty_ztypes__freebsd__arm64.go Thu Mar 26 11:24:23 2020 (r529175) @@ -0,0 +1,32 @@ +--- vendor/github.com/creack/pty/ztypes_freebsd_arm64.go.orig 2019-12-23 19:57:30 UTC ++++ vendor/github.com/creack/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/creack/pty/ztypes_freebsd_arm64.go.orig 2019-12-23 19:57:30 UTC ++++ vendor/github.com/creack/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/net/concourse-fly/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/net/concourse-fly/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Thu Mar 26 11:24:23 2020 (r529175) @@ -0,0 +1,48 @@ +From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001 +From: Tobias Klauser +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 +TryBot-Result: Gobot Gobot +Reviewed-by: Brad Fitzpatrick +--- 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 +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 +TryBot-Result: Gobot Gobot +Reviewed-by: Brad Fitzpatrick +--- 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 + }