From nobody Fri Apr 22 07:35:01 2022 X-Original-To: dev-commits-ports-branches@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 62B8011DA2C1; Fri, 22 Apr 2022 07:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kl5lp1QRqz4m4c; Fri, 22 Apr 2022 07:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650612902; 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=Cw1MTfMkCJL4PzSx8Gxf2N/TJg2Q75TF85VHOcue2U4=; b=uTGF7yi9GQJR7UyPfTUKUR9AC4ege6lHKvEyHAnOz3XYaFQpUzIw+J5w8V4h+QP7exJdGd Llzb3ki/XhM5XkZxFE+2zyXPT9CD3WQjNJsXz51glRXCu3eNXyPvPf548WG63mR2KUdixr i/tUNjuoNodZf8V0kBTp+YPWafCxnZ3grqtdMPjoeetsHd0TBygXVK2fwVToJp7CznDQeb Jk48R/0NXuECZ0Irq7qRynmpCq8fGcveAfMAFCc/xpmA4FfUR15GPJGYLix3zce9HqcfDp ciGDAjQJB9h89Oyj/VHubUvsn3lP7c7tB2NSs9KgybPHcfiDodD9Iay0aYFabA== 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 11AB01922C; Fri, 22 Apr 2022 07:35:02 +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 23M7Z1xF047424; Fri, 22 Apr 2022 07:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23M7Z1I8047423; Fri, 22 Apr 2022 07:35:01 GMT (envelope-from git) Date: Fri, 22 Apr 2022 07:35:01 GMT Message-Id: <202204220735.23M7Z1I8047423@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guangyuan Yang Subject: git: b9313d5a3cdb - 2022Q2 - lang/go117: Add back go 1.17 for compatibility List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: b9313d5a3cdbb2690348b2f5e003f30b468fe133 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650612902; 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=Cw1MTfMkCJL4PzSx8Gxf2N/TJg2Q75TF85VHOcue2U4=; b=nLKn6IA4nYfECbM6srl0iOXxYnE+otdLFIWavrYeUj3zFQyEDYRGy/aoyh3uRnrbN4Ywd5 AS43L3hjvWgAKlhrLg6rYGBSpExpKIASK0o4h4aOrz221LlYRPmaKCYfH3pu9xH0vltbCI oW5AWPQJnmy3On8xWWxsQUb6pcYD1xxXJqn5d8K5gBTRHBUkYbbu1lW1TaWvYJJbVuAxx7 nkGIsBAZfi4mygr0r/j44gFxfg+DQz9ENaybXGnPC2gLu+o2VnNaAvJevP3DXyXsi1WpgV jRG8q6RAXD4F6+BsT68uago45U9UI+VK6prieUOfi9aVebLaJoXzN/0Mvu58oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650612902; a=rsa-sha256; cv=none; b=ulYSmTAojwIqS05Kikj9TFvwUxwDmIZHLdQTHZo1aqhvRWkhmSIfq4wYgMWURh9kHpYq8h 7vi6LVaHNgvy87pih6Cx6zxyr5ahStgTyLSnelVMRC+UZR2WylmXkKj2SEk3QM18DAWOXr Wwgw80+dgohpSv6IfFzGMq8RacIpGBqJtTNHzKDhoyrvJ4cq/Pr8s1VuUQbiR4DNp9O31s Z6IqkoGMdLcZuwmjHZJBJgmB5o18NXFhRPEBkdS9Mdj+0YJMKlqXFD8rvlFFNSqsS7SXan 7Uo0LH+WYHrAY+DqYyU8/liSZ8Ase9n4VHqjtx6mn2LvK2Gga1/HqtXMal19Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9313d5a3cdbb2690348b2f5e003f30b468fe133 commit b9313d5a3cdbb2690348b2f5e003f30b468fe133 Author: Guangyuan Yang AuthorDate: 2022-04-05 02:36:14 +0000 Commit: Guangyuan Yang CommitDate: 2022-04-22 07:33:43 +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. (cherry picked from commit c417ff6a126de63cff856054d300dec819d06401) --- 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.