git: 25ce624e15ad - main - deskutils/dstask: fix build on riscv64

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Mon, 27 Mar 2023 11:27:20 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=25ce624e15ad79b594608f907eca2d9b9f8cbdf1

commit 25ce624e15ad79b594608f907eca2d9b9f8cbdf1
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-25 01:26:06 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-27 11:24:57 +0000

    deskutils/dstask: fix build on riscv64
    
    Bump golang.org/x/sys dependency to a version new enough
    to support riscv64-freebsd.
    
    Sponsored by:   Berliner Linux User Group e.V.
    Approved by:    portmgr (build fix blanket)
---
 deskutils/dstask/Makefile                       |  5 ++
 deskutils/dstask/distinfo                       |  4 +-
 deskutils/dstask/files/patch-go.mod             | 39 ++++++++++++
 deskutils/dstask/files/patch-go.sum             | 11 ++++
 deskutils/dstask/files/patch-vendor_modules.txt | 85 +++++++++++++++++++++++++
 5 files changed, 143 insertions(+), 1 deletion(-)

diff --git a/deskutils/dstask/Makefile b/deskutils/dstask/Makefile
index 3cdb8a5396f3..b0cb11699e18 100644
--- a/deskutils/dstask/Makefile
+++ b/deskutils/dstask/Makefile
@@ -18,6 +18,11 @@ GO_TARGET=	./cmd/dstask ./cmd/dstask-import
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	naggie
+GH_TUPLE=	golang:sys:v0.6.0:sys
+
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/deskutils/dstask/distinfo b/deskutils/dstask/distinfo
index 53dc9dd7ac72..feb3c1e605f3 100644
--- a/deskutils/dstask/distinfo
+++ b/deskutils/dstask/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1668093439
+TIMESTAMP = 1679707302
 SHA256 (naggie-dstask-v0.26_GH0.tar.gz) = ccd7afcb825eb799bdaaaf6eaf8150bbb8ceda02fec6c97f042b7bbc913a46fc
 SIZE (naggie-dstask-v0.26_GH0.tar.gz) = 3297022
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/deskutils/dstask/files/patch-go.mod b/deskutils/dstask/files/patch-go.mod
new file mode 100644
index 000000000000..0f544bb90dff
--- /dev/null
+++ b/deskutils/dstask/files/patch-go.mod
@@ -0,0 +1,39 @@
+--- go.mod.orig	2023-03-25 01:23:43 UTC
++++ go.mod
+@@ -1,21 +1,30 @@
+ module github.com/naggie/dstask
+ 
+-go 1.16
++go 1.17
+ 
+ require (
+ 	github.com/BurntSushi/toml v0.3.1
+ 	github.com/gofrs/uuid v3.3.0+incompatible
+-	github.com/google/go-cmp v0.5.2 // indirect
+ 	github.com/mattn/go-isatty v0.0.12
+ 	github.com/mvdan/xurls v1.1.0
+-	github.com/pkg/errors v0.9.1 // indirect
+ 	github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b
+-	github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
+ 	github.com/sirupsen/logrus v1.7.0
+ 	github.com/stretchr/testify v1.6.1
+-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
+ 	golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
+-	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4
++	golang.org/x/sys v0.6.0
+ 	gopkg.in/yaml.v2 v2.3.0
+ 	gotest.tools v2.2.0+incompatible
++)
++
++require (
++	github.com/davecgh/go-spew v1.1.1 // indirect
++	github.com/golang/protobuf v1.4.2 // indirect
++	github.com/google/go-cmp v0.5.2 // indirect
++	github.com/pkg/errors v0.9.1 // indirect
++	github.com/pmezard/go-difflib v1.0.0 // indirect
++	github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
++	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
++	google.golang.org/appengine v1.6.6 // indirect
++	google.golang.org/protobuf v1.25.0 // indirect
++	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+ )
diff --git a/deskutils/dstask/files/patch-go.sum b/deskutils/dstask/files/patch-go.sum
new file mode 100644
index 000000000000..f098fdb4eeed
--- /dev/null
+++ b/deskutils/dstask/files/patch-go.sum
@@ -0,0 +1,11 @@
+--- go.sum.orig	2023-03-25 01:23:46 UTC
++++ go.sum
+@@ -248,6 +248,8 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go
+ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
+ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/deskutils/dstask/files/patch-vendor_modules.txt b/deskutils/dstask/files/patch-vendor_modules.txt
new file mode 100644
index 000000000000..e6913ec2180c
--- /dev/null
+++ b/deskutils/dstask/files/patch-vendor_modules.txt
@@ -0,0 +1,85 @@
+--- vendor/modules.txt.orig	2023-03-25 01:24:08 UTC
++++ vendor/modules.txt
+@@ -2,21 +2,23 @@
+ ## explicit
+ github.com/BurntSushi/toml
+ # github.com/davecgh/go-spew v1.1.1
++## explicit
+ github.com/davecgh/go-spew/spew
+ # github.com/gofrs/uuid v3.3.0+incompatible
+ ## explicit
+ github.com/gofrs/uuid
+ # github.com/golang/protobuf v1.4.2
++## explicit; go 1.9
+ github.com/golang/protobuf/proto
+ # github.com/google/go-cmp v0.5.2
+-## explicit
++## explicit; go 1.8
+ github.com/google/go-cmp/cmp
+ github.com/google/go-cmp/cmp/internal/diff
+ github.com/google/go-cmp/cmp/internal/flags
+ github.com/google/go-cmp/cmp/internal/function
+ github.com/google/go-cmp/cmp/internal/value
+ # github.com/mattn/go-isatty v0.0.12
+-## explicit
++## explicit; go 1.12
+ github.com/mattn/go-isatty
+ # github.com/mvdan/xurls v1.1.0
+ ## explicit
+@@ -25,6 +27,7 @@ github.com/mvdan/xurls
+ ## explicit
+ github.com/pkg/errors
+ # github.com/pmezard/go-difflib v1.0.0
++## explicit
+ github.com/pmezard/go-difflib/difflib
+ # github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b
+ ## explicit
+@@ -35,25 +38,26 @@ github.com/shurcooL/graphql
+ github.com/shurcooL/graphql/ident
+ github.com/shurcooL/graphql/internal/jsonutil
+ # github.com/sirupsen/logrus v1.7.0
+-## explicit
++## explicit; go 1.13
+ github.com/sirupsen/logrus
+ # github.com/stretchr/testify v1.6.1
+-## explicit
++## explicit; go 1.13
+ github.com/stretchr/testify/assert
+ # golang.org/x/net v0.0.0-20201021035429-f5854403a974
+-## explicit
++## explicit; go 1.11
+ golang.org/x/net/context
+ golang.org/x/net/context/ctxhttp
+ # golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
+-## explicit
++## explicit; go 1.11
+ golang.org/x/oauth2
+ golang.org/x/oauth2/internal
+-# golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4
+-## explicit
++# golang.org/x/sys v0.6.0
++## explicit; go 1.17
+ golang.org/x/sys/internal/unsafeheader
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
+ # google.golang.org/appengine v1.6.6
++## explicit; go 1.11
+ google.golang.org/appengine/internal
+ google.golang.org/appengine/internal/base
+ google.golang.org/appengine/internal/datastore
+@@ -62,6 +66,7 @@ google.golang.org/appengine/internal/remote_api
+ google.golang.org/appengine/internal/urlfetch
+ google.golang.org/appengine/urlfetch
+ # google.golang.org/protobuf v1.25.0
++## explicit; go 1.9
+ google.golang.org/protobuf/encoding/prototext
+ google.golang.org/protobuf/encoding/protowire
+ google.golang.org/protobuf/internal/descfmt
+@@ -92,6 +97,7 @@ google.golang.org/protobuf/runtime/protoimpl
+ ## explicit
+ gopkg.in/yaml.v2
+ # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
++## explicit
+ gopkg.in/yaml.v3
+ # gotest.tools v2.2.0+incompatible
+ ## explicit