diff options
author | Colin L Rice <colin@daedrum.net> | 2021-01-06 02:37:58 -0500 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-02-17 06:30:32 +1000 |
commit | 9eb88a2e1de744ccd397d695e0811dc017b5c0fb (patch) | |
tree | ce595fecbd2de0d4dd2ca8f7760935b610dd5322 /pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch | |
parent | 35fbdb657f272b1cadb8159bcdc1ed7ad7cd4bb4 (diff) |
go_1_16: init at 1.16
Changes are minor - I ended up just patching the ssl certs at the root file, rather than trying to keep up with the various darwin changes. The externalnetwork test helper location changed, to so I had to update that patch as well. - Add xcbuild as propagatedBuildInput on darwin https://github.com/golang/go/commit/7e25bdba5e79d223566745fca2410f725a6dedda
Diffstat (limited to 'pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch')
-rw-r--r-- | pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch new file mode 100644 index 0000000000000..9edf6efa85176 --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index d8fd91f1fe..8bc08e6fed 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/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. |