From nobody Mon Mar 13 23:07:15 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PbC3S24S3z3yKWn; Mon, 13 Mar 2023 23:07:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PbC3S0cS5z3Nxn; Mon, 13 Mar 2023 23:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678748836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FU/wnvXbQL35Fqev4pqJqvHqa+s+RUPMIqwNOD9/nts=; b=woBupDeqJBipyfyuMmRYccaDcrTTQC7aRSaypjErIPF8zq0Pm03DVZeTIs+YkRagOj2oZO bRukKaDFSHPAnhJs1HTatd8QnkHI434AzMmQ/U7VPYz7Lo5HbIzdyvMTEW2GOz8yC6o7KI B64M2SBYs8s8iwbRyQxbj9tA6l0xM46D6Z2X41QKnnn8PP1PIgr4yA/4PpRE5wiVZLkLy4 FXlrUvUHXfUrqwVTf8HxCmZCaoJ76gK2YXtLoAM/52qF1rETiIcJH6O3yG6aX+aftTCnFL IrYjQNDZ+zx3b9dFheQLl/fCr+nCGoZFI0sjfaI/EQvQIxvEt2IOfYDvLmZs8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678748836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FU/wnvXbQL35Fqev4pqJqvHqa+s+RUPMIqwNOD9/nts=; b=VHBUIe1RrxEASw7/G6vt+/dQcwsM1IYxFtbet+4IdAc8Y/IiedqLjLb1p3OIiMvnlhcl5v FoahUX/84IjrTw/F5QhNuSK7vvYMbBmd/CdyGjtWXO5kUmFEea2pIeJ188U933IvHrozch R0T26Ix1FJSWispD9l112AiPeI2FjW3Z4ux5b8kJn/uY7vCd47hFubNi8FJfJYefiVBg/i i/IHABn0NnAS/eJC4JFm28DRWXrvyLdTMR2gCKvV/9v1KgqEiAR9e/U10yVIBtq8psvov+ izzR1TfwwmPr8uM++Az2SaZLTP3/Y4Q60vizEUXujaYBwO/vOF9p36Ycsx7q3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678748836; a=rsa-sha256; cv=none; b=p9aEQXys6h+jD9Ui56QZvuQcdV0kDqruW6JoyAEhPkPd59128PokdNDIR1klDeNzJ2A2Tf tsXNbxt7ned1vtvZRDC1O8UWBZjvyU2M7ejnFlsq/GIah3Zc7Trb9C8a0STkI5Ql2//E74 B5UsE6Z6bRC4odUaRTquzSWseV8lkCjlMmefDKX5zRNyy7rVkIjaLDaMWJ33xDBwjye/uH d5ldmNftiU3uwANt2oh8Os23FqGrtPwe3W1jWosBi7XG7ZXGzoeQ/Vk36hsK1wGxvfCZ/c bft8TPu3xFm3ywwSFWocH6h2lEcWn0fujCaSLajTBy0FDoeKbzMMivHZlm6ZAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PbC3R6ngtz1BSy; Mon, 13 Mar 2023 23:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32DN7FeY048551; Mon, 13 Mar 2023 23:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DN7FR2048550; Mon, 13 Mar 2023 23:07:15 GMT (envelope-from git) Date: Mon, 13 Mar 2023 23:07:15 GMT Message-Id: <202303132307.32DN7FR2048550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: c5187ab4770c - main - sysutils/container-diff: fix build on riscv64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5187ab4770c77001c7c17ebfd110c1f26e755d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5187ab4770c77001c7c17ebfd110c1f26e755d1 commit c5187ab4770c77001c7c17ebfd110c1f26e755d1 Author: Robert Clausecker AuthorDate: 2023-03-11 12:01:06 +0000 Commit: Robert Clausecker CommitDate: 2023-03-13 23:06:18 +0000 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 --- sysutils/container-diff/Makefile | 8 +++++++- sysutils/container-diff/distinfo | 4 +++- ...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 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 -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 - }