From nobody Tue Apr 05 02:42:22 2022 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 6F5771A9C78C; Tue, 5 Apr 2022 02:42:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KXX3y22GGz4Sj9; Tue, 5 Apr 2022 02:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649126542; 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=oFQ66cKcBZdGv9TNnzFiM3S6BdNn9fy+yEAnpz+KCc8=; b=gxudWl0U2Xbz2NOffF2xTLwqWfmne8bv0LgAL04z0flgoGZ9G9SQNIL0P/v28wD2FxksWV FIKTXXm6hCm2SEIlBfJwXaHOuuag+ZwJvnhOoNoUy12gTYE4RZU0+Axw2KFo+LscXBzsNu 4x3EOG3dOB5BaEIFNnyj/Ztk6oBTIADvMiX1eP1qrTukSu1HVx/sX0G+WS3r6M2beozlW3 Z2h6ERA8zvgIQutkxhwRSbjLiTbqLs+i/S7RyImasalOK77TYSOIBJQQi7YAScoH2z/6Ux oYnHXpIVuqRvcaDvk0xT9ckKloleZz15knzuHFAXSj8qZQ5u4wx2xMWiJv/vZQ== 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 264391E604; Tue, 5 Apr 2022 02:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2352gMew055899; Tue, 5 Apr 2022 02:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2352gMsY055898; Tue, 5 Apr 2022 02:42:22 GMT (envelope-from git) Date: Tue, 5 Apr 2022 02:42:22 GMT Message-Id: <202204050242.2352gMsY055898@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: c417ff6a126d - main - lang/go117: Add back go 1.17 for compatibility 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c417ff6a126de63cff856054d300dec819d06401 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649126542; 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=oFQ66cKcBZdGv9TNnzFiM3S6BdNn9fy+yEAnpz+KCc8=; b=QeaQlRlDFhiSuKqsmI36rUjV2XpWmMn5xyXxOO41B8a7mcGBx306sJn2nC19Exn5fk/FMs n/aI5jaEFDRxIvKC36U4V8I+zRo1D07jh6dZLro66z4HAw0lb4gWJ6meJPccmzVmhwWo47 Pbdku9LL/U3Ajfwj3ieN0adNznZvRnUt9z4KwMNipVHBdnCiu9Lh9vsY00cNIddimTWR48 xbuQyoDjrS7LHqK0JYheRUdmMqBQt/7AlYscIRSU2uXU2fOJqKWHMR8dzkdiWs7fzubqzb WPkLO5446n14yezs/Gu7wRbqKSsQjztgJ8QC0fOetDO6tf5kmtGmZ3G7P6gGOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649126542; a=rsa-sha256; cv=none; b=XnhsuhmcLTDK7HOX+yXEA9OhLbgvuhHKPnzo0gx0pWCfbvonvJfAsnI2UyBzkaHzB86Hlu 0eBFvOmt3EFozAVUNoOMAgjiWSX/J/+5/TgjvpF1uLRzGZytH5S2OweX5qQBe7GnP/vide uoNqnoGEEXE1piOr3fFyUcz5WBgQW6rg7uqbEIfKBfAtVewsgQlFZIUNj44CXLZ7C6Kjt1 yQffstW7YbPg9VEnKjZRDQRB6gftByyoFq3Z6e0FeXlPJQdfuvfdSvy7miAVYGBSnM0udy vw0vQ36C2G9zvmoGIluaQv52l58ySJs7CQhfSgGTmrriJgCI1SF9CArslZU0jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c417ff6a126de63cff856054d300dec819d06401 commit c417ff6a126de63cff856054d300dec819d06401 Author: Guangyuan Yang AuthorDate: 2022-04-05 02:36:14 +0000 Commit: Guangyuan Yang CommitDate: 2022-04-05 02:36:14 +0000 lang/go117: Add back go 1.17 for compatibility Some ports have dependencies that are not compatible with go 1.18 yet. Add 1.17 back to allow these ports to build. --- lang/Makefile | 1 + lang/go117/Makefile | 28 ++++++++++++++++++++++ lang/go117/distinfo | 13 ++++++++++ .../patch-src_cmd_go_internal_modload_vendor.go | 11 +++++++++ 4 files changed, 53 insertions(+) diff --git a/lang/Makefile b/lang/Makefile index b9be2443c4a8..d1fc2033fd90 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -113,6 +113,7 @@ SUBDIR += gnustep-base SUBDIR += go SUBDIR += go-devel + SUBDIR += go117 SUBDIR += gomacro SUBDIR += gprolog SUBDIR += gravity diff --git a/lang/go117/Makefile b/lang/go117/Makefile new file mode 100644 index 000000000000..7a364fe3bbaa --- /dev/null +++ b/lang/go117/Makefile @@ -0,0 +1,28 @@ +PORTVERSION= 1.17.8 +# Always set PORTREVISION and PORTEPOCH explicitly as otherwise they are inherited from lang/go +PORTREVISION= 0 +PORTEPOCH= 0 +MASTER_SITES= https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \ + LOCAL/dmgk:bootstrap +PKGNAMESUFFIX= -devel +DISTFILES= go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap + +# Avoid conflicting patch files +PATCHFILES= + +COMMENT= Go programming language (development version) + +USE_GITHUB= yes +GH_ACCOUNT= golang +GH_TAGNAME= 7dd10d4ce20e64d96a10cb67794851a58d96a2aa + +CONFLICTS_INSTALL= go + +MASTERDIR= ${.CURDIR}/../go +PATCHDIR= ${.CURDIR}/files +DISTINFO_FILE= ${.CURDIR}/distinfo + +post-extract: + @[ -f ${WRKSRC}/VERSION ] || ${ECHO_CMD} "${PORTVERSION} +${GH_TAGNAME}" > ${WRKSRC}/VERSION + +.include "${MASTERDIR}/Makefile" diff --git a/lang/go117/distinfo b/lang/go117/distinfo new file mode 100644 index 000000000000..1d9d927cd6d7 --- /dev/null +++ b/lang/go117/distinfo @@ -0,0 +1,13 @@ +TIMESTAMP = 1649116438 +SHA256 (go-freebsd-arm64-go1.14.tar.xz) = d1db1a73575b361815b7fafdc33b095337f7f3795ba9960ae712f6f4754a9ca6 +SIZE (go-freebsd-arm64-go1.14.tar.xz) = 17956864 +SHA256 (golang-go-1.17.8-7dd10d4ce20e64d96a10cb67794851a58d96a2aa_GH0.tar.gz) = 903cb4363af9a1c9a6c9d08ea0525983634862a5cb1f893b0b6156e3b99f847c +SIZE (golang-go-1.17.8-7dd10d4ce20e64d96a10cb67794851a58d96a2aa_GH0.tar.gz) = 22176903 +SHA256 (go-freebsd-amd64-go1.14.tar.xz) = 3b259247fb228258a4f31e283e9aa23cafd590eabce334666a9e9b2ffe47c19b +SIZE (go-freebsd-amd64-go1.14.tar.xz) = 35927980 +SHA256 (go-freebsd-arm6-go1.14.tar.xz) = 5846b4bbc6881c6c04daffbdb647d53a5b002a0e177271ecfcabef734b209614 +SIZE (go-freebsd-arm6-go1.14.tar.xz) = 35164388 +SHA256 (go-freebsd-arm7-go1.14.tar.xz) = 3d40c0f093bc3dc6cb84e92f8462a9c6a88a19a0ba75f813211f9d5d766b7737 +SIZE (go-freebsd-arm7-go1.14.tar.xz) = 35398032 +SHA256 (go-freebsd-386-go1.14.tar.xz) = c1a798154ae1ed2be6027d883e4611dd19edbe07a3f6d4f71d9437bddf3ed9ca +SIZE (go-freebsd-386-go1.14.tar.xz) = 36118928 diff --git a/lang/go117/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go117/files/patch-src_cmd_go_internal_modload_vendor.go new file mode 100644 index 000000000000..721bed32419f --- /dev/null +++ b/lang/go117/files/patch-src_cmd_go_internal_modload_vendor.go @@ -0,0 +1,11 @@ +--- src/cmd/go/internal/modload/vendor.go.orig 2020-12-17 16:03:19 UTC ++++ src/cmd/go/internal/modload/vendor.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if semver.Compare(index.goVersionV, "v1.14") < 0 { ++ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // 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.