Date: Wed, 6 Mar 2024 22:21:43 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: dac17f4e52e6 - 2024Q1 - lang/go*: Update to Go 1.22 snapshot Message-ID: <202403062221.426MLhFo034066@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=dac17f4e52e6f0e0bde3a9787b4fa22c3a8957f7 commit dac17f4e52e6f0e0bde3a9787b4fa22c3a8957f7 Author: Ashish SHUKLA <ashish@FreeBSD.org> AuthorDate: 2024-02-16 10:28:07 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2024-03-06 22:05:14 +0000 lang/go*: Update to Go 1.22 snapshot - Add overridable BUILD_DEPENDS on shells/bash, but only for Go 1.22+ - Since lang/go121 also depends on it, allow SHEBANG_FILES to be overridden - Re-roll the patch - Update lang/go120 to co-exist with lang/go-devel update - Update lang/go121 to co-exist with lang/go-devel update PR: 277091 (cherry picked from commit ccd8e6b89786dd2e9e30bfe65887811f9ecb69d6) --- lang/go-devel/Makefile | 13 +++++++------ lang/go-devel/distinfo | 6 +++--- .../patch-src_cmd_go_internal_modload_vendor.go | 20 ++++++++++---------- lang/go120/Makefile | 5 +++++ lang/go121/Makefile | 5 +++++ 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile index 3d8664feae90..0882e9f806a0 100644 --- a/lang/go-devel/Makefile +++ b/lang/go-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= go -DISTVERSION?= g20230808 +DISTVERSION?= g20240208 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES?= https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \ @@ -20,6 +20,7 @@ IGNORE= fails to build with qemu-user-static 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 @@ -35,16 +36,16 @@ CPE_VENDOR= golang .ifndef MASTERDIR USE_GITHUB= yes GH_ACCOUNT= golang -# go1.21.0 -GH_TAGNAME= c19c4c566c63818dfd059b352e52c4710eecf14d +# go1.22 +GH_TAGNAME= 20107e05a609b8f2e61a6b5e8dc258237ad046e7 .endif -SHEBANG_FILES= misc/wasm/go_js_wasm_exec \ - src/net/http/cgi/testdata/test.cgi +SHEBANG_FILES?= misc/wasm/go_js_wasm_exec misc/wasm/go_wasip1_wasm_exec 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 @@ -105,7 +106,7 @@ do-build: GOARM=${GOARM_${ARCH}} \ GOAMD64=${GOAMD64} \ CC=${CC} \ - ${SH} make.bash -v + ${BASH} make.bash -v do-install: @cd ${WRKSRC} ; \ diff --git a/lang/go-devel/distinfo b/lang/go-devel/distinfo index 14509dc36995..5258ab2251ff 100644 --- a/lang/go-devel/distinfo +++ b/lang/go-devel/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1691753450 +TIMESTAMP = 1707649478 SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623 SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640 -SHA256 (golang-go-g20230808-c19c4c566c63818dfd059b352e52c4710eecf14d_GH0.tar.gz) = 1f9ab60c3dba69e1f29ce2e20f0ccfa03e0c7d5106a66b874f881ddc432dde98 -SIZE (golang-go-g20230808-c19c4c566c63818dfd059b352e52c4710eecf14d_GH0.tar.gz) = 27148273 +SHA256 (golang-go-g20240208-20107e05a609b8f2e61a6b5e8dc258237ad046e7_GH0.tar.gz) = 61f4ed9886864b7b509bc981952f8fb7dbf68c31997af3f0dc1d1c12df53a1d4 +SIZE (golang-go-g20240208-20107e05a609b8f2e61a6b5e8dc258237ad046e7_GH0.tar.gz) = 27738771 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 diff --git a/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go index 9d2288522539..ba3f97226624 100644 --- a/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go +++ b/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go @@ -1,11 +1,11 @@ ---- src/cmd/go/internal/modload/vendor.go.orig 2023-08-02 13:51:49 UTC +--- src/cmd/go/internal/modload/vendor.go.orig 2024-02-02 18:09:55 UTC +++ src/cmd/go/internal/modload/vendor.go -@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFi - readVendorList(MainModules.mustGetSingleMainModule()) - - pre114 := false -- if gover.Compare(index.goVersion, "1.14") < 0 { -+ if gover.Compare(index.goVersion, "1.14") < 0 || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. +@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, m + panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) + } + index := indexes[0] +- if gover.Compare(index.goVersion, "1.14") < 0 { ++ if gover.Compare(index.goVersion, "1.14") < 0 || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/lang/go120/Makefile b/lang/go120/Makefile index 6ececa3ea4de..61909fb99c69 100644 --- a/lang/go120/Makefile +++ b/lang/go120/Makefile @@ -12,9 +12,14 @@ PATCHFILES= COMMENT= Go programming language +BUILD_DEPENDS= + MASTERDIR= ${.CURDIR}/../go-devel PATCHDIR= ${.CURDIR}/files WRKSRC= ${WRKDIR}/go DISTINFO_FILE= ${.CURDIR}/distinfo +SHEBANG_FILES= misc/wasm/go_js_wasm_exec \ + src/net/http/cgi/testdata/test.cgi +BASH= ${SH} .include "${MASTERDIR}/Makefile" diff --git a/lang/go121/Makefile b/lang/go121/Makefile index 9ca849394338..71bdd142905f 100644 --- a/lang/go121/Makefile +++ b/lang/go121/Makefile @@ -12,9 +12,14 @@ PATCHFILES= COMMENT= Go programming language +BUILD_DEPENDS= + MASTERDIR= ${.CURDIR}/../go-devel PATCHDIR= ${.CURDIR}/files WRKSRC= ${WRKDIR}/go DISTINFO_FILE= ${.CURDIR}/distinfo +SHEBANG_FILES= misc/wasm/go_js_wasm_exec \ + src/net/http/cgi/testdata/test.cgi +BASH= ${SH} .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403062221.426MLhFo034066>