diff options
| author | Robert Clausecker <fuz@FreeBSD.org> | 2023-03-11 12:01:06 +0000 |
|---|---|---|
| committer | Robert Clausecker <fuz@FreeBSD.org> | 2023-03-13 23:06:18 +0000 |
| commit | c5187ab4770c77001c7c17ebfd110c1f26e755d1 (patch) | |
| tree | 08902738268039399c33e7dd237fbae5ed7de8a9 /sysutils/container-diff | |
| parent | 8eaa8395d7a79cbcaeb49d2ec6d99aa684a43854 (diff) | |
| download | ports-c5187ab4770c77001c7c17ebfd110c1f26e755d1.tar.gz ports-c5187ab4770c77001c7c17ebfd110c1f26e755d1.zip | |
sysutils/container-diff: fix build on riscv64
Bump golang.org/x/sys dependency to a version new enough to support
riscv64-freebsd. Remove patch obsoleted through this change.
Sponsored by: Berliner Linux User Group e.V.
Approved by: portmgr (build fix blanket)
Differential Revision: https://reviews.freebsd.org/D39043
Diffstat (limited to 'sysutils/container-diff')
| -rw-r--r-- | sysutils/container-diff/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/container-diff/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/container-diff/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go | 24 |
3 files changed, 10 insertions, 26 deletions
diff --git a/sysutils/container-diff/Makefile b/sysutils/container-diff/Makefile index ac701ff69150..aee5b4c663cd 100644 --- a/sysutils/container-diff/Makefile +++ b/sysutils/container-diff/Makefile @@ -1,7 +1,7 @@ PORTNAME= container-diff PORTVERSION= 0.17.0 DISTVERSIONPREFIX= v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils MAINTAINER= sunpoet@FreeBSD.org @@ -12,6 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} @@ -20,4 +22,8 @@ PLIST_FILES= bin/container-diff GH_ACCOUNT= GoogleContainerTools USE_GITHUB= yes +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + .include <bsd.port.mk> diff --git a/sysutils/container-diff/distinfo b/sysutils/container-diff/distinfo index 629fecf40230..27fa135fe32c 100644 --- a/sysutils/container-diff/distinfo +++ b/sysutils/container-diff/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1624189697 +TIMESTAMP = 1678535597 SHA256 (GoogleContainerTools-container-diff-v0.17.0_GH0.tar.gz) = b1d909c4eff0e3355ba45516daddef0adfa4cdcd0c8b41863060c66f524353f9 SIZE (GoogleContainerTools-container-diff-v0.17.0_GH0.tar.gz) = 2565245 +SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/sysutils/container-diff/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/sysutils/container-diff/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go deleted file mode 100644 index 0e0603b77cee..000000000000 --- a/sysutils/container-diff/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go +++ /dev/null @@ -1,24 +0,0 @@ -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 - } |