Daniel Jakots <d...@chown.me> writes:

> Hey,
>
> Trying to update minio, I got this error during `make fake`:
>
> go: downloading go1.23.6 (openbsd/amd64)
> go: download go1.23.6 for openbsd/amd64: toolchain not available
>
> The error happens because a recent commit in minio began to use the
> toolchain directive in go.mod.
> https://github.com/minio/minio/commit/703f51164d3d0c44af41b0d86075a1f61e4779e7#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6
>
> This 'toolchain' directive was added in go1.21. With it, a module can
> define which version you should use. Check this article for more
> details: https://go.dev/doc/toolchain
>
> In our case, I don't see any use-case where we would want to download
> the toolchain from Google. So let's disable this?

it makes sense to me to only use local toolchain in the ports build.

ok semarie@ (but wait for jsing@ too).

> Index: go.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/go/go.port.mk,v
> diff -u -p -r1.81 go.port.mk
> --- go.port.mk        7 Feb 2025 02:50:49 -0000       1.81
> +++ go.port.mk        10 Feb 2025 00:54:27 -0000
> @@ -52,6 +52,7 @@ MODGO_GOPATH ?=             ${MODGO_WORKSPACE}:${MO
>  # to explicitly disable SSE on i386 builds.
>  MAKE_ENV +=          GO386=softfloat
>  MAKE_ENV +=          GOCACHE="${MODGO_GOCACHE}"
> +MAKE_ENV +=          GOTOOLCHAIN=local
>  MAKE_ENV +=          TMPDIR="${WRKBUILD}"
>  
>  MODGO_CMD ?=         ${SETENV} ${MAKE_ENV} go
>
>
> With this, minio successfully builds (here's its diff for reference).
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/minio/server/Makefile,v
> diff -u -p -r1.63 Makefile
> --- Makefile  4 Feb 2025 22:06:26 -0000       1.63
> +++ Makefile  10 Feb 2025 00:51:50 -0000
> @@ -1,7 +1,7 @@
>  COMMENT =    object storage server compatible with Amazon S3 APIs
>  
> -V =          2025-02-03T21-03-04Z
> -CID =                712fe1a8dfd64bbc3fde1863cbbf55ae17e7c911
> +V =          2025-02-07T23-21-09Z
> +CID =                703f51164d3d0c44af41b0d86075a1f61e4779e7
>  SHORTCID =   ${CID:C/(............).*/\1/}
>  
>  MODGO_MODNAME =      github.com/minio/minio
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/minio/server/distinfo,v
> diff -u -p -r1.48 distinfo
> --- distinfo  4 Feb 2025 22:06:26 -0000       1.48
> +++ distinfo  10 Feb 2025 00:51:51 -0000
> @@ -1719,7 +1719,7 @@ SHA256 (go_modules/sigs.k8s.io/structure
>  SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 
> 8ikTVRI4fWZj4fCZmkkiq3CN7UvcgExxzpPj1gK6ld0=
>  SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.4.0.mod) = 
> CZ2G+OBNET1A9KFSzf4AFxFtfv6mjkF6nGRthgJj174=
>  SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.4.0.zip) = 
> 7wMf94/5twNuF07vSd+9d0aNxPCvtzpjm2H4qzocxCU=
> -SHA256 (minio-v0.0.0-20250203210304-712fe1a8dfd6.zip) = 
> BUOIYuhMXI0neNrAaQTf/4MceO089daTvNyeFe38bo0=
> +SHA256 (minio-v0.0.0-20250207232109-703f51164d3d.zip) = 
> 6gLXAHE5fCkom1ziN7mL802qng+A4DtvHCGEviW9uG0=
>  SIZE (go_modules/aead.dev/mem/@v/v0.2.0.mod) = 29
>  SIZE (go_modules/aead.dev/mem/@v/v0.2.0.zip) = 19860
>  SIZE (go_modules/aead.dev/minisign/@v/v0.2.0.mod) = 222
> @@ -3441,4 +3441,4 @@ SIZE (go_modules/sigs.k8s.io/structured-
>  SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 106
>  SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.4.0.mod) = 133
>  SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.4.0.zip) = 222726
> -SIZE (minio-v0.0.0-20250203210304-712fe1a8dfd6.zip) = 25050957
> +SIZE (minio-v0.0.0-20250207232109-703f51164d3d.zip) = 25052314
>
> Comments/OK for the go.port.mk?
>
> Cheers,
> Daniel
>

-- 
Sebastien Marie

Reply via email to