From nobody Sun Sep 08 16:06:02 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1vvt2bvHz5VHmN; Sun, 08 Sep 2024 16:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X1vvt29R9z4MMW; Sun, 8 Sep 2024 16:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725811562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBbW+XKMiYs0X3Z2kQh70CKqkOGNkPOtRl4EdJj/uBM=; b=ivBeuz22H4IoyLom2H8L1MIyniCKHzaGLAJHLv+6brsTSA6+5hDotTQTO8zr3CJZpdncBx P1zgxZ6k084SdWsdF2xx79Rsz+vM+ow+FRFRN7vbAGS1ZcIc2U250GNhLOXnPCctCUmQCU hNZBkd5NgzpqJSYD0M9VTrMY9TBiLXnmPr04FgjHJjs3cV0Zgp8Q+O34Kdd7sKYyduUZnx cA31B62+zJo/mLxGyEfxBL4y40WyqsqS+HC+8Wg03u3OaF/ZkG6hSSJH6v40UR6MNITjYb van3GJubmNnQ/ZvwZMeuQSpCq7iYpFQ1tCiYpYPSlFGSPCG4mdU4BwI1h80PVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725811562; a=rsa-sha256; cv=none; b=BUep1qy+Tt69sF1BiF0fof3eEFyAIANqjNm7wkOAmGnNAjAU+g62vHf5zrOeqf05FMQe03 pG3u3rkzryQrxYupOfWr7Bcydq6PELTmcnxrzgmxd+vzXLXWqWTOzn0+gdDwpudMnzcC1E myTL/5AdhjGzhxipe0CxteQtdS4jpKJHDGvs5H8bcOjGXHT4z6/rp19Pph1vyJBegiWYJU 5lzT7C8w1rCerEd+L91ej8IphUM8xOL40UnXT23qIDCoxcXbPunzMuHeUU7vrDRT1Ay2cu 45xPFNkGIR332aqZSimY7b73OrHZjcQ1LyfK39ZcDZrLpwgzNmqT4YGNxCE2WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725811562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBbW+XKMiYs0X3Z2kQh70CKqkOGNkPOtRl4EdJj/uBM=; b=BTNKZKDnqhBYQ5+WBPaTkFnBL7BeVuELFp5Jaq+OAAaElvsy9QSFsrMQ9t0OIucXrQQq4z SBFT5DmzYQdjM720Ts6Alg4hLApqt+uqjvAXBF3TZbga58FYLdyVVU2dygx1trnexRU34m xaB6ZmNuSqN3Yk6P/va23TNi+ju00JiGV3HeaMZAtc1B7t9t/0xmRTXdyAZUl4/lzcx1gJ VLB6+8+GOk4xprJUAbJMIRW5EkQEuZiRnOdWuMbEEJGVvXgTJLRmHyMXo7SMlESZ5wJq1I ly3WXAJE2dI/g76NYWAiGBAcWaKh6RyjsJri8CieP2FE6ty6NgAZgp+kXrsvkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X1vvt1gbWzQCf; Sun, 8 Sep 2024 16:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488G62RE055639; Sun, 8 Sep 2024 16:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488G62pW055636; Sun, 8 Sep 2024 16:06:02 GMT (envelope-from git) Date: Sun, 8 Sep 2024 16:06:02 GMT Message-Id: <202409081606.488G62pW055636@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: f4b88cbec33d - main - lang/go123: Add port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4b88cbec33d76136715e807763824b4fdb7bb42 Auto-Submitted: auto-generated The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4b88cbec33d76136715e807763824b4fdb7bb42 commit f4b88cbec33d76136715e807763824b4fdb7bb42 Author: Adam Weinberger AuthorDate: 2024-09-08 16:02:37 +0000 Commit: Adam Weinberger CommitDate: 2024-09-08 16:02:37 +0000 lang/go123: Add port Simple copy from lang/go122. PR: 280963 Reported by: yuri --- lang/go123/Makefile | 19 ++++++++++++++++++ lang/go123/distinfo | 15 ++++++++++++++ lang/go123/files/patch-src_cmd_dist_build.go | 23 ++++++++++++++++++++++ .../patch-src_cmd_go_internal_modload_vendor.go | 11 +++++++++++ 4 files changed, 68 insertions(+) diff --git a/lang/go123/Makefile b/lang/go123/Makefile new file mode 100644 index 000000000000..9e840b65b05e --- /dev/null +++ b/lang/go123/Makefile @@ -0,0 +1,19 @@ +DISTVERSION= 1.23.1 +# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel +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= +PATCHDIR= ${.CURDIR}/files + +COMMENT= Go programming language + +MASTERDIR= ${.CURDIR}/../go-devel +WRKSRC= ${WRKDIR}/go +DISTINFO_FILE= ${.CURDIR}/distinfo + +.include "${MASTERDIR}/Makefile" diff --git a/lang/go123/distinfo b/lang/go123/distinfo new file mode 100644 index 000000000000..88e5c1745f1d --- /dev/null +++ b/lang/go123/distinfo @@ -0,0 +1,15 @@ +TIMESTAMP = 1725809259 +SHA256 (go1.23.1.src.tar.gz) = 6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d +SIZE (go1.23.1.src.tar.gz) = 28164249 +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 diff --git a/lang/go123/files/patch-src_cmd_dist_build.go b/lang/go123/files/patch-src_cmd_dist_build.go new file mode 100644 index 000000000000..59fd0c6539f8 --- /dev/null +++ b/lang/go123/files/patch-src_cmd_dist_build.go @@ -0,0 +1,23 @@ +--- src/cmd/dist/build.go.orig 2024-03-29 15:27:02 UTC ++++ src/cmd/dist/build.go +@@ -891,6 +891,20 @@ func runInstall(pkg string, ch chan struct{}) { + asmArgs = append(asmArgs, "-D", "GOPPC64_power8") + } + } ++ if goarch == "arm" { ++ // Define GOARM_value from goarm, which can be either a version ++ // like "6", or a version and a FP mode, like "7,hardfloat". ++ switch { ++ case strings.Contains(goarm, "7"): ++ asmArgs = append(asmArgs, "-D", "GOARM_7") ++ fallthrough ++ case strings.Contains(goarm, "6"): ++ asmArgs = append(asmArgs, "-D", "GOARM_6") ++ fallthrough ++ default: ++ asmArgs = append(asmArgs, "-D", "GOARM_5") ++ } ++ } + goasmh := pathf("%s/go_asm.h", workdir) + + // Collect symabis from assembly code. diff --git a/lang/go123/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go123/files/patch-src_cmd_go_internal_modload_vendor.go new file mode 100644 index 000000000000..ba3f97226624 --- /dev/null +++ b/lang/go123/files/patch-src_cmd_go_internal_modload_vendor.go @@ -0,0 +1,11 @@ +--- src/cmd/go/internal/modload/vendor.go.orig 2024-02-02 18:09:55 UTC ++++ src/cmd/go/internal/modload/vendor.go +@@ -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.