Attachment #248506 for bug #277091




PORTNAME=	go
DISTVERSION?=	g20240208
PORTREVISION?=	0
CATEGORIES=	lang
MASTER_SITES?=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \


ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 riscv64

BUILD_DEPENDS?=	bash:shells/bash
RUN_DEPENDS=	${RUN_DEPENDS_${ARCH}}
# ld.bfd from devel/binutils is needed for working cgo on aarch64
RUN_DEPENDS_aarch64=	binutils>0:devel/binutils

.ifndef MASTERDIR
USE_GITHUB=	yes
GH_ACCOUNT=	golang
# go1.22
GH_TAGNAME=	20107e05a609b8f2e61a6b5e8dc258237ad046e7
.endif

SHEBANG_FILES?=	misc/wasm/go_js_wasm_exec misc/wasm/go_wasip1_wasm_exec
		src/net/http/cgi/testdata/test.cgi
SHEBANG_GLOB=	*.bash *.pl *.sh

# Upstream archive contains files with UTF-8 names
EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
BASH?=		${LOCALBASE}/bin/bash

OPTIONS_DEFINE_i386=	SOFTFLOAT
OPTIONS_DEFAULT_amd64=	V1

		GOARM=${GOARM_${ARCH}} \
		GOAMD64=${GOAMD64} \
		CC=${CC} \
		${BASH} make.bash -v

do-install:
	@cd ${WRKSRC} ; \

Lines 1-8 Link Here

(-)b/lang/go-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1691753450	1	TIMESTAMP = 1707649478
2	SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623	2	SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623
3	SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640	3	SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640
4	SHA256 (golang-go-g20230808-c19c4c566c63818dfd059b352e52c4710eecf14d_GH0.tar.gz) = 1f9ab60c3dba69e1f29ce2e20f0ccfa03e0c7d5106a66b874f881ddc432dde98	4	SHA256 (golang-go-g20240208-20107e05a609b8f2e61a6b5e8dc258237ad046e7_GH0.tar.gz) = 61f4ed9886864b7b509bc981952f8fb7dbf68c31997af3f0dc1d1c12df53a1d4
5	SIZE (golang-go-g20230808-c19c4c566c63818dfd059b352e52c4710eecf14d_GH0.tar.gz) = 27148273	5	SIZE (golang-go-g20240208-20107e05a609b8f2e61a6b5e8dc258237ad046e7_GH0.tar.gz) = 27738771
6	SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c	6	SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
7	SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360	7	SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360
8	SHA256 (go-freebsd-arm6-go1.20.tar.xz) = acf99dbb285c6d2b80e0abfe4bffd0d230516ea84d17be0d5bc1045809e3d33a	8	SHA256 (go-freebsd-arm6-go1.20.tar.xz) = acf99dbb285c6d2b80e0abfe4bffd0d230516ea84d17be0d5bc1045809e3d33a

Lines 1-11 Link Here

(-)b/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go (-10 / +10 lines)
1	--- src/cmd/go/internal/modload/vendor.go.orig 2023-08-02 13:51:49 UTC	1	--- src/cmd/go/internal/modload/vendor.go.orig 2024-02-02 18:09:55 UTC
2	+++ src/cmd/go/internal/modload/vendor.go	2	+++ src/cmd/go/internal/modload/vendor.go
3	@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFi	3	@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, m
4	readVendorList(MainModules.mustGetSingleMainModule())	4	panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes)))
5		5	}
6	pre114 := false	6	index := indexes[0]
7	- if gover.Compare(index.goVersion, "1.14") < 0 {	7	- if gover.Compare(index.goVersion, "1.14") < 0 {
8	+ if gover.Compare(index.goVersion, "1.14") < 0 \|\| os.Getenv("GO_NO_VENDOR_CHECKS") == "1" {	8	+ if gover.Compare(index.goVersion, "1.14") < 0 \|\| os.Getenv("GO_NO_VENDOR_CHECKS") == "1" {
9	// Go versions before 1.14 did not include enough information in	9	// Go versions before 1.14 did not include enough information in
10	// vendor/modules.txt to check for consistency.	10	// vendor/modules.txt to check for consistency.
11	// If we know that we're on an earlier version, relax the consistency check.	11	// If we know that we're on an earlier version, relax the consistency check.

Lines 12-20 PATCHFILES= Link Here

(-)b/lang/go120/Makefile (+5 lines)
12		12
13	COMMENT= Go programming language	13	COMMENT= Go programming language
14		14
		15	BUILD_DEPENDS=
		16
15	MASTERDIR= ${.CURDIR}/../go-devel	17	MASTERDIR= ${.CURDIR}/../go-devel
16	PATCHDIR= ${.CURDIR}/files	18	PATCHDIR= ${.CURDIR}/files
17	WRKSRC= ${WRKDIR}/go	19	WRKSRC= ${WRKDIR}/go
18	DISTINFO_FILE= ${.CURDIR}/distinfo	20	DISTINFO_FILE= ${.CURDIR}/distinfo
		21	SHEBANG_FILES= misc/wasm/go_js_wasm_exec \
		22	src/net/http/cgi/testdata/test.cgi
		23	BASH= ${SH}
19		24
20	.include "${MASTERDIR}/Makefile"	25	.include "${MASTERDIR}/Makefile"




DISTVERSION=	1.22.0
# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
PORTREVISION=	0
MASTER_SITES=	https://golang.org/dl/ \
		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
		LOCAL/dmgk:bootstrap
DISTFILES=	go${DISTVERSION}.src.tar.gz \
		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap

# Avoid conflicting patch files
PATCHFILES=

COMMENT=	Go programming language

MASTERDIR=	${.CURDIR}/../go-devel
WRKSRC=		${WRKDIR}/go
DISTINFO_FILE=	${.CURDIR}/distinfo

.include "${MASTERDIR}/Makefile"




TIMESTAMP = 1707648070
SHA256 (go1.22.0.src.tar.gz) = 4d196c3d41a0d6c1dfc64d04e3cc1f608b0c436bd87b7060ce3e23234e1f4d5c
SIZE (go1.22.0.src.tar.gz) = 27544122
SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623
SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640
SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360
SHA256 (go-freebsd-arm6-go1.20.tar.xz) = acf99dbb285c6d2b80e0abfe4bffd0d230516ea84d17be0d5bc1045809e3d33a
SIZE (go-freebsd-arm6-go1.20.tar.xz) = 33418476
SHA256 (go-freebsd-arm7-go1.20.tar.xz) = 12dd61c802eada70380f0b4755656d82dbf228575c056775c682456380be5039
SIZE (go-freebsd-arm7-go1.20.tar.xz) = 33346596
SHA256 (go-freebsd-386-go1.20.tar.xz) = 34e888a37153270b33503a23885ea4c85ba4bd09849d2c937fc9d312c0f49983
SIZE (go-freebsd-386-go1.20.tar.xz) = 35448892
SHA256 (go-freebsd-riscv64-go1.20.tar.xz) = 010921013d24124ff31f4b1965456349547acf936572fc6e0bcf95a0542794bd
SIZE (go-freebsd-riscv64-go1.20.tar.xz) = 33807544

Added Link Here

(-)b/lang/go122/files/patch-src_cmd_go_internal_modload_vendor.go (-1 / +11 lines)
0	-	1	--- src/cmd/go/internal/modload/vendor.go.orig 2024-02-02 18:09:55 UTC
		2	+++ src/cmd/go/internal/modload/vendor.go
		3	@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, m
		4	panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes)))
		5	}
		6	index := indexes[0]
		7	- if gover.Compare(index.goVersion, "1.14") < 0 {
		8	+ if gover.Compare(index.goVersion, "1.14") < 0 \|\| os.Getenv("GO_NO_VENDOR_CHECKS") == "1" {
		9	// Go versions before 1.14 did not include enough information in
		10	// vendor/modules.txt to check for consistency.
		11	// If we know that we're on an earlier version, relax the consistency check.

Return to bug 277091

Lines 1-5 Link Here

(-)b/lang/go-devel/Makefile (-6 / +7 lines)
1	PORTNAME= go	1	PORTNAME= go
2	DISTVERSION?= g20230808	2	DISTVERSION?= g20240208
3	PORTREVISION?= 0	3	PORTREVISION?= 0
4	CATEGORIES= lang	4	CATEGORIES= lang
5	MASTER_SITES?= https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \	5	MASTER_SITES?= https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
Lines 20-25 IGNORE= fails to build with qemu-user-static Link Here
20		20
21	ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 riscv64	21	ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 riscv64
22		22
		23	BUILD_DEPENDS?= bash:shells/bash
23	RUN_DEPENDS= ${RUN_DEPENDS_${ARCH}}	24	RUN_DEPENDS= ${RUN_DEPENDS_${ARCH}}
24	# ld.bfd from devel/binutils is needed for working cgo on aarch64	25	# ld.bfd from devel/binutils is needed for working cgo on aarch64
25	RUN_DEPENDS_aarch64= binutils>0:devel/binutils	26	RUN_DEPENDS_aarch64= binutils>0:devel/binutils
Lines 35-50 CPE_VENDOR= golang Link Here
35	.ifndef MASTERDIR	36	.ifndef MASTERDIR
36	USE_GITHUB= yes	37	USE_GITHUB= yes
37	GH_ACCOUNT= golang	38	GH_ACCOUNT= golang
38	# go1.21.0	39	# go1.22
39	GH_TAGNAME= c19c4c566c63818dfd059b352e52c4710eecf14d	40	GH_TAGNAME= 20107e05a609b8f2e61a6b5e8dc258237ad046e7
40	.endif	41	.endif
41		42
42	SHEBANG_FILES= misc/wasm/go_js_wasm_exec \	43	SHEBANG_FILES?= misc/wasm/go_js_wasm_exec misc/wasm/go_wasip1_wasm_exec
43	src/net/http/cgi/testdata/test.cgi
44	SHEBANG_GLOB= .bash .pl *.sh	44	SHEBANG_GLOB= .bash .pl *.sh
45		45
46	# Upstream archive contains files with UTF-8 names	46	# Upstream archive contains files with UTF-8 names
47	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR}	47	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
		48	BASH?= ${LOCALBASE}/bin/bash
48		49
49	OPTIONS_DEFINE_i386= SOFTFLOAT	50	OPTIONS_DEFINE_i386= SOFTFLOAT
50	OPTIONS_DEFAULT_amd64= V1	51	OPTIONS_DEFAULT_amd64= V1
Lines 105-111 do-build: Link Here
105	GOARM=${GOARM_${ARCH}} \	106	GOARM=${GOARM_${ARCH}} \
106	GOAMD64=${GOAMD64} \	107	GOAMD64=${GOAMD64} \
107	CC=${CC} \	108	CC=${CC} \
108	${SH} make.bash -v	109	${BASH} make.bash -v
109		110
110	do-install:	111	do-install:
111	@cd ${WRKSRC} ; \	112	@cd ${WRKSRC} ; \

Lines 12-20 PATCHFILES= Link Here

(-)b/lang/go121/Makefile (-2 / +5 lines)
12		12
13	COMMENT= Go programming language	13	COMMENT= Go programming language
14		14
		15	BUILD_DEPENDS=
		16
15	MASTERDIR= ${.CURDIR}/../go-devel	17	MASTERDIR= ${.CURDIR}/../go-devel
16	PATCHDIR= ${.CURDIR}/files	18	PATCHDIR= ${.CURDIR}/files
17	WRKSRC= ${WRKDIR}/go	19	WRKSRC= ${WRKDIR}/go
18	DISTINFO_FILE= ${.CURDIR}/distinfo	20	DISTINFO_FILE= ${.CURDIR}/distinfo
		21	SHEBANG_FILES= misc/wasm/go_js_wasm_exec \
		22	src/net/http/cgi/testdata/test.cgi
		23	BASH= ${SH}
19		24
20	.include "${MASTERDIR}/Makefile"	25	.include "${MASTERDIR}/Makefile"
21	-
22	--
23	lang/go122/Makefile \| 19 +++++++++++++++++++	26	lang/go122/Makefile \| 19 +++++++++++++++++++
24	lang/go122/distinfo \| 15 +++++++++++++++	27	lang/go122/distinfo \| 15 +++++++++++++++
25	...atch-src_cmd_go_internal_modload_vendor.go \| 11 +++++++++++	28	...atch-src_cmd_go_internal_modload_vendor.go \| 11 +++++++++++
26	3 files changed, 45 insertions(+)	29	3 files changed, 45 insertions(+)
27	create mode 100644 lang/go122/Makefile	30	create mode 100644 lang/go122/Makefile
28	create mode 100644 lang/go122/distinfo	31	create mode 100644 lang/go122/distinfo
29	create mode 100644 lang/go122/files/patch-src_cmd_go_internal_modload_vendor.go	32	create mode 100644 lang/go122/files/patch-src_cmd_go_internal_modload_vendor.go

Added Link Here

(-)b/lang/go122/Makefile (+19 lines)
1	DISTVERSION= 1.22.0
2	# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
3	PORTREVISION= 0
4	MASTER_SITES= https://golang.org/dl/ \
5	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
6	LOCAL/dmgk:bootstrap
7	DISTFILES= go${DISTVERSION}.src.tar.gz \
8	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
9
10	# Avoid conflicting patch files
11	PATCHFILES=
12
13	COMMENT= Go programming language
14
15	MASTERDIR= ${.CURDIR}/../go-devel
16	WRKSRC= ${WRKDIR}/go
17	DISTINFO_FILE= ${.CURDIR}/distinfo
18
19	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/lang/go122/distinfo (+15 lines)
1	TIMESTAMP = 1707648070
2	SHA256 (go1.22.0.src.tar.gz) = 4d196c3d41a0d6c1dfc64d04e3cc1f608b0c436bd87b7060ce3e23234e1f4d5c
3	SIZE (go1.22.0.src.tar.gz) = 27544122
4	SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623
5	SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640
6	SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
7	SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360
8	SHA256 (go-freebsd-arm6-go1.20.tar.xz) = acf99dbb285c6d2b80e0abfe4bffd0d230516ea84d17be0d5bc1045809e3d33a
9	SIZE (go-freebsd-arm6-go1.20.tar.xz) = 33418476
10	SHA256 (go-freebsd-arm7-go1.20.tar.xz) = 12dd61c802eada70380f0b4755656d82dbf228575c056775c682456380be5039
11	SIZE (go-freebsd-arm7-go1.20.tar.xz) = 33346596
12	SHA256 (go-freebsd-386-go1.20.tar.xz) = 34e888a37153270b33503a23885ea4c85ba4bd09849d2c937fc9d312c0f49983
13	SIZE (go-freebsd-386-go1.20.tar.xz) = 35448892
14	SHA256 (go-freebsd-riscv64-go1.20.tar.xz) = 010921013d24124ff31f4b1965456349547acf936572fc6e0bcf95a0542794bd
15	SIZE (go-freebsd-riscv64-go1.20.tar.xz) = 33807544