Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
5 changed files
with
30 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters