Date: Mon, 13 Mar 2023 23:07:13 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 245d6dad4d87 - main - devel/pydio-packr: fix build on riscv64 Message-ID: <202303132307.32DN7DYo048509@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=245d6dad4d87d7ac4a924981becb04cfbf8a27f6 commit 245d6dad4d87d7ac4a924981becb04cfbf8a27f6 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-03-11 10:20:59 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-03-13 23:05:45 +0000 devel/pydio-packr: 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) Differential Revision: https://reviews.freebsd.org/D39041 --- devel/pydio-packr/Makefile | 8 ++- devel/pydio-packr/distinfo | 4 +- devel/pydio-packr/files/patch-go.mod | 30 ++++++++++ devel/pydio-packr/files/patch-go.sum | 11 ++++ devel/pydio-packr/files/patch-vendor_modules.txt | 72 ++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 2 deletions(-) diff --git a/devel/pydio-packr/Makefile b/devel/pydio-packr/Makefile index 20dd4fa2d160..906859caffe0 100644 --- a/devel/pydio-packr/Makefile +++ b/devel/pydio-packr/Makefile @@ -2,7 +2,7 @@ PORTNAME= packr DISTVERSIONPREFIX= v DISTVERSION= 1.30.2-0.20200608151212 DISTVERSIONSUFFIX= -7d41389ccc6e -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel PKGNAMEPREFIX= pydio- @@ -17,12 +17,18 @@ NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= www/pydio-cells doesn't build on i386, so there's no point building pydio-packr USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys GO_MODULE= github.com/pydio/packr GO_TARGET= ./packr PLIST_FILES= bin/pydio-packr +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${PORTNAME} diff --git a/devel/pydio-packr/distinfo b/devel/pydio-packr/distinfo index d38d872e9d5b..ae9c268fbf11 100644 --- a/devel/pydio-packr/distinfo +++ b/devel/pydio-packr/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1621169452 +TIMESTAMP = 1678529684 SHA256 (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.mod) = 58b0303c07cc8bea31e992ffe04fd9b9fddfb75924ba8b75033d7d1e961005b2 SIZE (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.mod) = 316 SHA256 (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.zip) = 507b08772bcd71db243f12b5d6c254c0099dc494d3078a3b929ef45f1983c793 SIZE (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.zip) = 37808 +SHA256 (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/devel/pydio-packr/files/patch-go.mod b/devel/pydio-packr/files/patch-go.mod new file mode 100644 index 000000000000..ba66eb747d8e --- /dev/null +++ b/devel/pydio-packr/files/patch-go.mod @@ -0,0 +1,30 @@ +--- go.mod.orig 2023-03-11 10:16:45 UTC ++++ go.mod +@@ -1,6 +1,6 @@ + module github.com/pydio/packr + +-go 1.12 ++go 1.17 + + require ( + github.com/gobuffalo/envy v1.7.0 +@@ -10,4 +10,19 @@ require ( + github.com/spf13/cobra v0.0.5 + github.com/stretchr/testify v1.3.0 + golang.org/x/sync v0.0.0-20190423024810-112230192c58 ++) ++ ++require ( ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/gobuffalo/logger v1.0.0 // indirect ++ github.com/inconshreveable/mousetrap v1.0.0 // indirect ++ github.com/joho/godotenv v1.3.0 // indirect ++ github.com/karrick/godirwalk v1.10.12 // indirect ++ github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect ++ github.com/pmezard/go-difflib v1.0.0 // indirect ++ github.com/rogpeppe/go-internal v1.3.0 // indirect ++ github.com/sirupsen/logrus v1.4.2 // indirect ++ github.com/spf13/pflag v1.0.3 // indirect ++ golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 // indirect ++ golang.org/x/sys v0.6.0 // indirect + ) diff --git a/devel/pydio-packr/files/patch-go.sum b/devel/pydio-packr/files/patch-go.sum new file mode 100644 index 000000000000..22d15a49693d --- /dev/null +++ b/devel/pydio-packr/files/patch-go.sum @@ -0,0 +1,11 @@ +--- go.sum.orig 2023-03-11 10:16:48 UTC ++++ go.sum +@@ -73,6 +73,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go + golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 h1:khxRGsvPk4n2y8I/mLLjp7e5dMTJmH75wvqS6nMwUtY= + golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/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.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= + golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= diff --git a/devel/pydio-packr/files/patch-vendor_modules.txt b/devel/pydio-packr/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..4b0ac5cdae32 --- /dev/null +++ b/devel/pydio-packr/files/patch-vendor_modules.txt @@ -0,0 +1,72 @@ +--- vendor/modules.txt.orig 2023-03-11 10:17:32 UTC ++++ vendor/modules.txt +@@ -1,15 +1,21 @@ + # github.com/davecgh/go-spew v1.1.1 ++## explicit + github.com/davecgh/go-spew/spew + # github.com/gobuffalo/envy v1.7.0 ++## explicit + github.com/gobuffalo/envy + # github.com/gobuffalo/logger v1.0.0 ++## explicit; go 1.12 + github.com/gobuffalo/logger + # github.com/gobuffalo/packd v0.3.0 ++## explicit; go 1.12 + github.com/gobuffalo/packd + github.com/gobuffalo/packd/internal/takeon/github.com/markbates/errx + # github.com/gobuffalo/packr v1.30.1 ++## explicit; go 1.12 + github.com/gobuffalo/packr + # github.com/gobuffalo/packr/v2 v2.5.2 ++## explicit; go 1.12 + github.com/gobuffalo/packr/v2/file + github.com/gobuffalo/packr/v2/file/resolver + github.com/gobuffalo/packr/v2/file/resolver/encoding/hex +@@ -19,32 +25,46 @@ github.com/gobuffalo/packr/v2/jam/parser + github.com/gobuffalo/packr/v2/jam/store + github.com/gobuffalo/packr/v2/plog + # github.com/inconshreveable/mousetrap v1.0.0 ++## explicit + github.com/inconshreveable/mousetrap + # github.com/joho/godotenv v1.3.0 ++## explicit + github.com/joho/godotenv + # github.com/karrick/godirwalk v1.10.12 ++## explicit; go 1.12 + github.com/karrick/godirwalk + # github.com/konsorten/go-windows-terminal-sequences v1.0.2 ++## explicit + github.com/konsorten/go-windows-terminal-sequences + # github.com/pmezard/go-difflib v1.0.0 ++## explicit + github.com/pmezard/go-difflib/difflib + # github.com/rogpeppe/go-internal v1.3.0 ++## explicit + github.com/rogpeppe/go-internal/modfile + github.com/rogpeppe/go-internal/module + github.com/rogpeppe/go-internal/semver + # github.com/sirupsen/logrus v1.4.2 ++## explicit + github.com/sirupsen/logrus + # github.com/spf13/cobra v0.0.5 ++## explicit; go 1.12 + github.com/spf13/cobra + # github.com/spf13/pflag v1.0.3 ++## explicit + github.com/spf13/pflag + # github.com/stretchr/testify v1.3.0 ++## explicit + github.com/stretchr/testify/assert + github.com/stretchr/testify/require + # golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 ++## explicit + golang.org/x/crypto/ssh/terminal + # golang.org/x/sync v0.0.0-20190423024810-112230192c58 ++## explicit + golang.org/x/sync/errgroup +-# golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 ++# 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303132307.32DN7DYo048509>