summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-27 10:53:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-29 23:07:13 +0000
commitc93239706f70b0cea59797814a409cfc376b3e0f (patch)
tree2e87829b5312a4102b53c78d5cfa3e73a487a56e /meta
parent6f092174b338066e5ac767312a914d00310690a1 (diff)
downloadpoky-c93239706f70b0cea59797814a409cfc376b3e0f.tar.gz
go: update 1.16.10 -> 1.17.3
This was additionally verified with meta-virtualization: $ bitbake packagegroup-container packagegroup-kubernetes $ bitbake container-base kvm-image-minimal xen-guest-image-minimal (From OE-Core rev: 7acfadc2ef96cd205a85713624ce96129b679b28) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/go/go-1.17.3.inc (renamed from meta/recipes-devtools/go/go-1.16.10.inc)6
-rw-r--r--meta/recipes-devtools/go/go-1.17/0001-allow-CC-and-CXX-to-have-multiple-words.patch (renamed from meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch)0
-rw-r--r--meta/recipes-devtools/go/go-1.17/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (renamed from meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch)64
-rw-r--r--meta/recipes-devtools/go/go-1.17/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (renamed from meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch)15
-rw-r--r--meta/recipes-devtools/go/go-1.17/0004-ld-add-soname-to-shareable-objects.patch (renamed from meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch)0
-rw-r--r--meta/recipes-devtools/go/go-1.17/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (renamed from meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch)16
-rw-r--r--meta/recipes-devtools/go/go-1.17/0006-cmd-dist-separate-host-and-target-builds.patch (renamed from meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch)61
-rw-r--r--meta/recipes-devtools/go/go-1.17/0007-cmd-go-make-GOROOT-precious-by-default.patch (renamed from meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch)0
-rw-r--r--meta/recipes-devtools/go/go-1.17/0008-use-GOBUILDMODE-to-set-buildmode.patch (renamed from meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch)0
-rw-r--r--meta/recipes-devtools/go/go-1.17/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch (renamed from meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch)27
-rw-r--r--meta/recipes-devtools/go/go-binary-native_1.17.3.bb (renamed from meta/recipes-devtools/go/go-binary-native_1.16.10.bb)4
-rw-r--r--meta/recipes-devtools/go/go-cross-canadian_1.17.3.bb (renamed from meta/recipes-devtools/go/go-cross-canadian_1.16.10.bb)0
-rw-r--r--meta/recipes-devtools/go/go-cross_1.17.3.bb (renamed from meta/recipes-devtools/go/go-cross_1.16.10.bb)0
-rw-r--r--meta/recipes-devtools/go/go-crosssdk_1.17.3.bb (renamed from meta/recipes-devtools/go/go-crosssdk_1.16.10.bb)0
-rw-r--r--meta/recipes-devtools/go/go-native_1.17.3.bb (renamed from meta/recipes-devtools/go/go-native_1.16.10.bb)0
-rw-r--r--meta/recipes-devtools/go/go-runtime_1.17.3.bb (renamed from meta/recipes-devtools/go/go-runtime_1.16.10.bb)0
-rw-r--r--meta/recipes-devtools/go/go_1.17.3.bb (renamed from meta/recipes-devtools/go/go_1.16.10.bb)0
18 files changed, 113 insertions, 82 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index d5167ee9ad..946dec74b6 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -23,7 +23,7 @@ GDBVERSION ?= "11.%"
23GLIBCVERSION ?= "2.34" 23GLIBCVERSION ?= "2.34"
24LINUXLIBCVERSION ?= "5.15%" 24LINUXLIBCVERSION ?= "5.15%"
25QEMUVERSION ?= "6.1%" 25QEMUVERSION ?= "6.1%"
26GOVERSION ?= "1.16%" 26GOVERSION ?= "1.17%"
27# This can not use wildcards like 8.0.% since it is also used in mesa to denote 27# This can not use wildcards like 8.0.% since it is also used in mesa to denote
28# llvm version being used, so always bump it with llvm recipe version bump 28# llvm version being used, so always bump it with llvm recipe version bump
29LLVMVERSION ?= "12.0.1" 29LLVMVERSION ?= "12.0.1"
diff --git a/meta/recipes-devtools/go/go-1.16.10.inc b/meta/recipes-devtools/go/go-1.17.3.inc
index 7549ffc211..4fe091787b 100644
--- a/meta/recipes-devtools/go/go-1.16.10.inc
+++ b/meta/recipes-devtools/go/go-1.17.3.inc
@@ -1,8 +1,6 @@
1require go-common.inc 1require go-common.inc
2 2
3GO_BASEVERSION = "1.16" 3FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-1.17:"
4PV = "1.16.10"
5FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
6 4
7LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
8 6
@@ -17,7 +15,7 @@ SRC_URI += "\
17 file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ 15 file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
18 file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \ 16 file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \
19" 17"
20SRC_URI[main.sha256sum] = "a905472011585e403d00d2a41de7ced29b8884309d73482a307f689fd0f320b5" 18SRC_URI[main.sha256sum] = "705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0"
21 19
22# Upstream don't believe it is a signifiant real world issue and will only 20# Upstream don't believe it is a signifiant real world issue and will only
23# fix in 1.17 onwards where we can drop this. 21# fix in 1.17 onwards where we can drop this.
diff --git a/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.17/0001-allow-CC-and-CXX-to-have-multiple-words.patch
index 5f4823be22..5f4823be22 100644
--- a/meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch
+++ b/meta/recipes-devtools/go/go-1.17/0001-allow-CC-and-CXX-to-have-multiple-words.patch
diff --git a/meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.17/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
index 04d0e496c0..42cd568ef9 100644
--- a/meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
+++ b/meta/recipes-devtools/go/go-1.17/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
@@ -1,7 +1,7 @@
1From a13ae484e41139094505d2834437e9262a5315f7 Mon Sep 17 00:00:00 2001 1From c403b45995c5daa6747ac4d95b39bc9a6feb2cda Mon Sep 17 00:00:00 2001
2From: Alex Kube <alexander.j.kube@gmail.com> 2From: Alex Kube <alexander.j.kube@gmail.com>
3Date: Wed, 23 Oct 2019 21:14:22 +0430 3Date: Wed, 23 Oct 2019 21:14:22 +0430
4Subject: [PATCH 2/9] cmd/go: make content-based hash generation less pedantic 4Subject: [PATCH] cmd/go: make content-based hash generation less pedantic
5 5
6Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
7 7
@@ -50,9 +50,11 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
50 src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++--------- 50 src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++---------
51 2 files changed, 49 insertions(+), 19 deletions(-) 51 2 files changed, 49 insertions(+), 19 deletions(-)
52 52
53diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
54index 20d0587..ff6f0d8 100644
53--- a/src/cmd/go/internal/envcmd/env.go 55--- a/src/cmd/go/internal/envcmd/env.go
54+++ b/src/cmd/go/internal/envcmd/env.go 56+++ b/src/cmd/go/internal/envcmd/env.go
55@@ -157,7 +157,7 @@ func ExtraEnvVars() []cfg.EnvVar { 57@@ -160,7 +160,7 @@ func ExtraEnvVars() []cfg.EnvVar {
56 func ExtraEnvVarsCostly() []cfg.EnvVar { 58 func ExtraEnvVarsCostly() []cfg.EnvVar {
57 var b work.Builder 59 var b work.Builder
58 b.Init() 60 b.Init()
@@ -61,9 +63,11 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
61 if err != nil { 63 if err != nil {
62 // Should not happen - b.CFlags was given an empty package. 64 // Should not happen - b.CFlags was given an empty package.
63 fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) 65 fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err)
66diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
67index 5a225fb..a37872e 100644
64--- a/src/cmd/go/internal/work/exec.go 68--- a/src/cmd/go/internal/work/exec.go
65+++ b/src/cmd/go/internal/work/exec.go 69+++ b/src/cmd/go/internal/work/exec.go
66@@ -37,6 +37,8 @@ import ( 70@@ -38,6 +38,8 @@ import (
67 "cmd/go/internal/trace" 71 "cmd/go/internal/trace"
68 ) 72 )
69 73
@@ -72,7 +76,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
72 // actionList returns the list of actions in the dag rooted at root 76 // actionList returns the list of actions in the dag rooted at root
73 // as visited in a depth-first post-order traversal. 77 // as visited in a depth-first post-order traversal.
74 func actionList(root *Action) []*Action { 78 func actionList(root *Action) []*Action {
75@@ -228,7 +230,7 @@ func (b *Builder) buildActionID(a *Actio 79@@ -229,7 +231,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {
76 // Assume b.WorkDir is being trimmed properly. 80 // Assume b.WorkDir is being trimmed properly.
77 // When -trimpath is used with a package built from the module cache, 81 // When -trimpath is used with a package built from the module cache,
78 // use the module path and version instead of the directory. 82 // use the module path and version instead of the directory.
@@ -81,25 +85,36 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
81 fmt.Fprintf(h, "dir %s\n", p.Dir) 85 fmt.Fprintf(h, "dir %s\n", p.Dir)
82 } else if cfg.BuildTrimpath && p.Module != nil { 86 } else if cfg.BuildTrimpath && p.Module != nil {
83 fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) 87 fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version)
84@@ -247,13 +249,13 @@ func (b *Builder) buildActionID(a *Actio 88@@ -248,9 +250,9 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {
85 } 89 }
86 if len(p.CgoFiles)+len(p.SwigFiles) > 0 { 90 if len(p.CgoFiles)+len(p.SwigFiles)+len(p.SwigCXXFiles) > 0 {
87 fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) 91 fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo"))
88- cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p) 92- cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p)
89- fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(), cppflags, cflags, ldflags)
90+ cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true) 93+ cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true)
91+ fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(true), cppflags, cflags, ldflags) 94
92 if len(p.CXXFiles)+len(p.SwigFiles) > 0 { 95- ccExe := b.ccExe()
93- fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(), cxxflags) 96+ ccExe := b.ccExe(true)
94+ fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(true), cxxflags) 97 fmt.Fprintf(h, "CC=%q %q %q %q\n", ccExe, cppflags, cflags, ldflags)
98 // Include the C compiler tool ID so that if the C
99 // compiler changes we rebuild the package.
100@@ -263,14 +265,14 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {
101 }
95 } 102 }
96 if len(p.FFiles) > 0 { 103 if len(p.CXXFiles)+len(p.SwigCXXFiles) > 0 {
97- fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(), fflags) 104- cxxExe := b.cxxExe()
98+ fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(true), fflags) 105+ cxxExe := b.cxxExe(true)
106 fmt.Fprintf(h, "CXX=%q %q\n", cxxExe, cxxflags)
107 if cxxID, err := b.gccToolID(cxxExe[0], "c++"); err == nil {
108 fmt.Fprintf(h, "CXX ID=%q\n", cxxID)
109 }
99 } 110 }
100 // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? 111 if len(p.FFiles) > 0 {
101 } 112- fcExe := b.fcExe()
102@@ -2401,33 +2403,48 @@ var ( 113+ fcExe := b.fcExe(true)
114 fmt.Fprintf(h, "FC=%q %q\n", fcExe, fflags)
115 if fcID, err := b.gccToolID(fcExe[0], "f95"); err == nil {
116 fmt.Fprintf(h, "FC ID=%q\n", fcID)
117@@ -2438,33 +2440,48 @@ var (
103 // gccCmd returns a gcc command line prefix 118 // gccCmd returns a gcc command line prefix
104 // defaultCC is defined in zdefaultcc.go, written by cmd/dist. 119 // defaultCC is defined in zdefaultcc.go, written by cmd/dist.
105 func (b *Builder) GccCmd(incdir, workdir string) []string { 120 func (b *Builder) GccCmd(incdir, workdir string) []string {
@@ -157,7 +172,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
157 } 172 }
158 173
159 // compilerExe returns the compiler to use given an 174 // compilerExe returns the compiler to use given an
160@@ -2436,11 +2453,16 @@ func (b *Builder) fcExe() []string { 175@@ -2473,11 +2490,16 @@ func (b *Builder) fcExe() []string {
161 // of the compiler but can have additional arguments if they 176 // of the compiler but can have additional arguments if they
162 // were present in the environment value. 177 // were present in the environment value.
163 // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. 178 // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"].
@@ -175,7 +190,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
175 return compiler 190 return compiler
176 } 191 }
177 192
178@@ -2620,7 +2642,7 @@ func envList(key, def string) []string { 193@@ -2667,7 +2689,7 @@ func envList(key, def string) []string {
179 } 194 }
180 195
181 // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. 196 // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo.
@@ -184,7 +199,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
184 defaults := "-g -O2" 199 defaults := "-g -O2"
185 200
186 if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { 201 if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil {
187@@ -2639,6 +2661,14 @@ func (b *Builder) CFlags(p *load.Package 202@@ -2686,6 +2708,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l
188 return 203 return
189 } 204 }
190 205
@@ -199,7 +214,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
199 return 214 return
200 } 215 }
201 216
202@@ -2653,7 +2683,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) 217@@ -2700,7 +2730,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`)
203 218
204 func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { 219 func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) {
205 p := a.Package 220 p := a.Package
@@ -208,7 +223,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
208 if err != nil { 223 if err != nil {
209 return nil, nil, err 224 return nil, nil, err
210 } 225 }
211@@ -3104,7 +3134,7 @@ func (b *Builder) swigIntSize(objdir str 226@@ -3151,7 +3181,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) {
212 227
213 // Run SWIG on one SWIG input file. 228 // Run SWIG on one SWIG input file.
214 func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { 229 func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) {
@@ -217,3 +232,6 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
217 if err != nil { 232 if err != nil {
218 return "", "", err 233 return "", "", err
219 } 234 }
235--
2362.20.1
237
diff --git a/meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.17/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
index 662c705471..2a86bdccf3 100644
--- a/meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
+++ b/meta/recipes-devtools/go/go-1.17/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
@@ -1,7 +1,7 @@
1From 28ada8896b76d620240bafc22aa395071d601482 Mon Sep 17 00:00:00 2001 1From 8512964c0bfdfc3c9c3805743ea7de551a1d476a Mon Sep 17 00:00:00 2001
2From: Alex Kube <alexander.j.kube@gmail.com> 2From: Alex Kube <alexander.j.kube@gmail.com>
3Date: Wed, 23 Oct 2019 21:15:37 +0430 3Date: Wed, 23 Oct 2019 21:15:37 +0430
4Subject: [PATCH 3/9] cmd/go: Allow GOTOOLDIR to be overridden in the environment 4Subject: [PATCH] cmd/go: Allow GOTOOLDIR to be overridden in the environment
5 5
6to allow for split host/target build roots 6to allow for split host/target build roots
7 7
@@ -12,15 +12,18 @@ Matt Madison <matt@madison.systems>.
12Upstream-Status: Inappropriate [OE specific] 12Upstream-Status: Inappropriate [OE specific]
13 13
14Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> 14Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
15
15--- 16---
16 src/cmd/dist/build.go | 4 +++- 17 src/cmd/dist/build.go | 4 +++-
17 src/cmd/go/internal/cfg/cfg.go | 6 +++++- 18 src/cmd/go/internal/cfg/cfg.go | 6 +++++-
18 2 files changed, 8 insertions(+), 2 deletions(-) 19 2 files changed, 8 insertions(+), 2 deletions(-)
19 20
21diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
22index bec1769..d82f612 100644
20--- a/src/cmd/dist/build.go 23--- a/src/cmd/dist/build.go
21+++ b/src/cmd/dist/build.go 24+++ b/src/cmd/dist/build.go
22@@ -246,7 +246,9 @@ func xinit() { 25@@ -248,7 +248,9 @@ func xinit() {
23 workdir = xworkdir() 26 }
24 xatexit(rmworkdir) 27 xatexit(rmworkdir)
25 28
26- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) 29- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
@@ -30,9 +33,11 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
30 } 33 }
31 34
32 // compilerEnv returns a map from "goos/goarch" to the 35 // compilerEnv returns a map from "goos/goarch" to the
36diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go
37index 57a3c1f..825d8c7 100644
33--- a/src/cmd/go/internal/cfg/cfg.go 38--- a/src/cmd/go/internal/cfg/cfg.go
34+++ b/src/cmd/go/internal/cfg/cfg.go 39+++ b/src/cmd/go/internal/cfg/cfg.go
35@@ -64,7 +64,11 @@ func defaultContext() build.Context { 40@@ -67,7 +67,11 @@ func defaultContext() build.Context {
36 // variables. This matches the initialization of ToolDir in 41 // variables. This matches the initialization of ToolDir in
37 // go/build, except for using ctxt.GOROOT rather than 42 // go/build, except for using ctxt.GOROOT rather than
38 // runtime.GOROOT. 43 // runtime.GOROOT.
diff --git a/meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.17/0004-ld-add-soname-to-shareable-objects.patch
index cd875f1164..cd875f1164 100644
--- a/meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch
+++ b/meta/recipes-devtools/go/go-1.17/0004-ld-add-soname-to-shareable-objects.patch
diff --git a/meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.17/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
index 59c12d9546..2845d21382 100644
--- a/meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
+++ b/meta/recipes-devtools/go/go-1.17/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
@@ -1,8 +1,7 @@
1From f05ef3ded52b98537c10efd0b15cd9612471524d Mon Sep 17 00:00:00 2001 1From 153e2dda6103fd9dd871be4bb495a8da5328301e Mon Sep 17 00:00:00 2001
2From: Alex Kube <alexander.j.kube@gmail.com> 2From: Alex Kube <alexander.j.kube@gmail.com>
3Date: Wed, 23 Oct 2019 21:17:16 +0430 3Date: Wed, 23 Oct 2019 21:17:16 +0430
4Subject: [PATCH 5/9] make.bash: override CC when building dist and 4Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap
5 go_bootstrap
6 5
7for handling OE cross-canadian builds. 6for handling OE cross-canadian builds.
8 7
@@ -13,13 +12,16 @@ Matt Madison <matt@madison.systems>.
13Upstream-Status: Inappropriate [OE specific] 12Upstream-Status: Inappropriate [OE specific]
14 13
15Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> 14Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
15
16--- 16---
17 src/make.bash | 4 ++-- 17 src/make.bash | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-) 18 1 file changed, 2 insertions(+), 2 deletions(-)
19 19
20diff --git a/src/make.bash b/src/make.bash
21index 7986125..dd67029 100755
20--- a/src/make.bash 22--- a/src/make.bash
21+++ b/src/make.bash 23+++ b/src/make.bash
22@@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; 24@@ -181,7 +181,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then
23 exit 1 25 exit 1
24 fi 26 fi
25 rm -f cmd/dist/dist 27 rm -f cmd/dist/dist
@@ -28,12 +30,12 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
28 30
29 # -e doesn't propagate out of eval, so check success by hand. 31 # -e doesn't propagate out of eval, so check success by hand.
30 eval $(./cmd/dist/dist env -p || echo FAIL=true) 32 eval $(./cmd/dist/dist env -p || echo FAIL=true)
31@@ -209,7 +209,7 @@ fi 33@@ -206,7 +206,7 @@ fi
32 # Run dist bootstrap to complete make.bash. 34 # Run dist bootstrap to complete make.bash.
33 # Bootstrap installs a proper cmd/dist, built with the new toolchain. 35 # Bootstrap installs a proper cmd/dist, built with the new toolchain.
34 # Throw ours, built with Go 1.4, away after bootstrap. 36 # Throw ours, built with Go 1.4, away after bootstrap.
35-./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" 37-./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@"
36+CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" 38+CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap -a $vflag $GO_DISTFLAGS "$@"
37 rm -f ./cmd/dist/dist 39 rm -f ./cmd/dist/dist
38 40
39 # DO NOT ADD ANY NEW CODE HERE. 41 # DO NOT ADD ANY NEW CODE HERE.
diff --git a/meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.17/0006-cmd-dist-separate-host-and-target-builds.patch
index 7aee0bac43..68e8efc1d2 100644
--- a/meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch
+++ b/meta/recipes-devtools/go/go-1.17/0006-cmd-dist-separate-host-and-target-builds.patch
@@ -1,7 +1,7 @@
1From 10735bb84df17ba657f76835f483cd8543a879c1 Mon Sep 17 00:00:00 2001 1From 7bc891e00be4263311d75aa2b2ee6a3b7b75355f Mon Sep 17 00:00:00 2001
2From: Alex Kube <alexander.j.kube@gmail.com> 2From: Alex Kube <alexander.j.kube@gmail.com>
3Date: Wed, 23 Oct 2019 21:18:12 +0430 3Date: Wed, 23 Oct 2019 21:18:12 +0430
4Subject: [PATCH 6/9] cmd/dist: separate host and target builds 4Subject: [PATCH] cmd/dist: separate host and target builds
5 5
6Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
7 7
@@ -34,21 +34,24 @@ the meta/recipes-devtools/go tree by
34Matt Madison <matt@madison.systems>. 34Matt Madison <matt@madison.systems>.
35 35
36Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> 36Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
37
37--- 38---
38 src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ 39 src/cmd/dist/build.go | 156 ++++++++++++++++++++++++++++++------------
39 1 file changed, 112 insertions(+), 43 deletions(-) 40 1 file changed, 113 insertions(+), 43 deletions(-)
40 41
42diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
43index d82f612..5c8459c 100644
41--- a/src/cmd/dist/build.go 44--- a/src/cmd/dist/build.go
42+++ b/src/cmd/dist/build.go 45+++ b/src/cmd/dist/build.go
43@@ -41,6 +41,7 @@ var ( 46@@ -43,6 +43,7 @@ var (
44 goldflags string 47 goexperiment string
45 workdir string 48 workdir string
46 tooldir string 49 tooldir string
47+ build_tooldir string 50+ build_tooldir string
48 oldgoos string 51 oldgoos string
49 oldgoarch string 52 oldgoarch string
50 exe string 53 exe string
51@@ -53,6 +54,7 @@ var ( 54@@ -55,6 +56,7 @@ var (
52 55
53 rebuildall bool 56 rebuildall bool
54 defaultclang bool 57 defaultclang bool
@@ -56,7 +59,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
56 59
57 vflag int // verbosity 60 vflag int // verbosity
58 ) 61 )
59@@ -249,6 +251,8 @@ func xinit() { 62@@ -251,6 +253,8 @@ func xinit() {
60 if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { 63 if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {
61 tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) 64 tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
62 } 65 }
@@ -65,7 +68,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
65 } 68 }
66 69
67 // compilerEnv returns a map from "goos/goarch" to the 70 // compilerEnv returns a map from "goos/goarch" to the
68@@ -480,8 +484,10 @@ func setup() { 71@@ -496,8 +500,10 @@ func setup() {
69 p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) 72 p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch)
70 if rebuildall { 73 if rebuildall {
71 xremoveall(p) 74 xremoveall(p)
@@ -76,9 +79,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
76 79
77 if goos != gohostos || goarch != gohostarch { 80 if goos != gohostos || goarch != gohostarch {
78 p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) 81 p := pathf("%s/pkg/%s_%s", goroot, goos, goarch)
79@@ -1244,12 +1250,29 @@ func cmdbootstrap() { 82@@ -1267,17 +1273,35 @@ func cmdbootstrap() {
80 83
81 var noBanner bool 84 var noBanner, noClean bool
82 var debug bool 85 var debug bool
83+ var hostOnly bool 86+ var hostOnly bool
84+ var targetOnly bool 87+ var targetOnly bool
@@ -87,12 +90,17 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
87 flag.BoolVar(&rebuildall, "a", rebuildall, "rebuild all") 90 flag.BoolVar(&rebuildall, "a", rebuildall, "rebuild all")
88 flag.BoolVar(&debug, "d", debug, "enable debugging of bootstrap process") 91 flag.BoolVar(&debug, "d", debug, "enable debugging of bootstrap process")
89 flag.BoolVar(&noBanner, "no-banner", noBanner, "do not print banner") 92 flag.BoolVar(&noBanner, "no-banner", noBanner, "do not print banner")
93 flag.BoolVar(&noClean, "no-clean", noClean, "print deprecation warning")
90+ flag.BoolVar(&hostOnly, "host-only", hostOnly, "build only host binaries, not target") 94+ flag.BoolVar(&hostOnly, "host-only", hostOnly, "build only host binaries, not target")
91+ flag.BoolVar(&targetOnly, "target-only", targetOnly, "build only target binaries, not host") 95+ flag.BoolVar(&targetOnly, "target-only", targetOnly, "build only target binaries, not host")
92 96
93- xflagparse(0) 97- xflagparse(0)
94+ xflagparse(-1) 98+ xflagparse(-1)
95 99
100 if noClean {
101 xprintf("warning: --no-clean is deprecated and has no effect; use 'go install std cmd' instead\n")
102 }
103
96+ if hostOnly && targetOnly { 104+ if hostOnly && targetOnly {
97+ fatalf("specify only one of --host-only or --target-only\n") 105+ fatalf("specify only one of --host-only or --target-only\n")
98+ } 106+ }
@@ -104,10 +112,11 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
104+ fatalf("package names not permitted without --host-only or --target-only\n") 112+ fatalf("package names not permitted without --host-only or --target-only\n")
105+ } 113+ }
106+ } 114+ }
115+
107 // Set GOPATH to an internal directory. We shouldn't actually 116 // Set GOPATH to an internal directory. We shouldn't actually
108 // need to store files here, since the toolchain won't 117 // need to store files here, since the toolchain won't
109 // depend on modules outside of vendor directories, but if 118 // depend on modules outside of vendor directories, but if
110@@ -1303,8 +1326,13 @@ func cmdbootstrap() { 119@@ -1345,8 +1369,13 @@ func cmdbootstrap() {
111 xprintf("\n") 120 xprintf("\n")
112 } 121 }
113 122
@@ -123,7 +132,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
123 goBootstrap := pathf("%s/go_bootstrap", tooldir) 132 goBootstrap := pathf("%s/go_bootstrap", tooldir)
124 cmdGo := pathf("%s/go", gobin) 133 cmdGo := pathf("%s/go", gobin)
125 if debug { 134 if debug {
126@@ -1333,7 +1361,11 @@ func cmdbootstrap() { 135@@ -1375,7 +1404,11 @@ func cmdbootstrap() {
127 xprintf("\n") 136 xprintf("\n")
128 } 137 }
129 xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") 138 xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n")
@@ -133,10 +142,10 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
133+ } else { 142+ } else {
134+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) 143+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
135+ } 144+ }
145 // Now that cmd/go is in charge of the build process, enable GOEXPERIMENT.
146 os.Setenv("GOEXPERIMENT", goexperiment)
136 goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) 147 goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...)
137 if debug { 148@@ -1414,50 +1447,84 @@ func cmdbootstrap() {
138 run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
139@@ -1370,50 +1402,84 @@ func cmdbootstrap() {
140 } 149 }
141 checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) 150 checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
142 151
@@ -188,6 +197,8 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
188- timelog("build", "host toolchain") 197- timelog("build", "host toolchain")
189- if vflag > 0 { 198- if vflag > 0 {
190- xprintf("\n") 199- xprintf("\n")
200- }
201- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)
191+ 202+
192+ if goos == oldgoos && goarch == oldgoarch { 203+ if goos == oldgoos && goarch == oldgoarch {
193+ // Common case - not setting up for cross-compilation. 204+ // Common case - not setting up for cross-compilation.
@@ -219,8 +230,7 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
219+ os.Setenv("GOARCH", goarch) 230+ os.Setenv("GOARCH", goarch)
220+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) 231+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
221+ xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) 232+ xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)
222 } 233+ }
223- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)
224 goInstall(goBootstrap, "std", "cmd") 234 goInstall(goBootstrap, "std", "cmd")
225 checkNotStale(goBootstrap, "std", "cmd") 235 checkNotStale(goBootstrap, "std", "cmd")
226 checkNotStale(cmdGo, "std", "cmd") 236 checkNotStale(cmdGo, "std", "cmd")
@@ -228,7 +238,12 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
228- timelog("build", "target toolchain") 238- timelog("build", "target toolchain")
229- if vflag > 0 { 239- if vflag > 0 {
230- xprintf("\n") 240- xprintf("\n")
231- } 241+ if debug {
242+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
243+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
244+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
245+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
246 }
232- goos = oldgoos 247- goos = oldgoos
233- goarch = oldgoarch 248- goarch = oldgoarch
234- os.Setenv("GOOS", goos) 249- os.Setenv("GOOS", goos)
@@ -249,16 +264,10 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
249- run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) 264- run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
250- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) 265- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
251- copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) 266- copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
252+ if debug {
253+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
254+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
255+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
256+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
257+ }
258 } 267 }
259 268
260 // Check that there are no new files in $GOROOT/bin other than 269 // Check that there are no new files in $GOROOT/bin other than
261@@ -1430,8 +1496,11 @@ func cmdbootstrap() { 270@@ -1474,8 +1541,11 @@ func cmdbootstrap() {
262 } 271 }
263 } 272 }
264 273
diff --git a/meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.17/0007-cmd-go-make-GOROOT-precious-by-default.patch
index 4b4d0d4f3d..4b4d0d4f3d 100644
--- a/meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch
+++ b/meta/recipes-devtools/go/go-1.17/0007-cmd-go-make-GOROOT-precious-by-default.patch
diff --git a/meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.17/0008-use-GOBUILDMODE-to-set-buildmode.patch
index 4e5d5021d6..4e5d5021d6 100644
--- a/meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch
+++ b/meta/recipes-devtools/go/go-1.17/0008-use-GOBUILDMODE-to-set-buildmode.patch
diff --git a/meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch b/meta/recipes-devtools/go/go-1.17/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch
index dcbdf58752..f857b72234 100644
--- a/meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch
+++ b/meta/recipes-devtools/go/go-1.17/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch
@@ -1,4 +1,4 @@
1From a983bc6cd48fb0da939e3329cac18d7a3b29ecf8 Mon Sep 17 00:00:00 2001 1From 66a45dae3af140662e17ef85c2e6fe40270a2553 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 22 Feb 2021 17:54:01 -0800 3Date: Mon, 22 Feb 2021 17:54:01 -0800
4Subject: [PATCH] Revert "cmd/go: make sure CC and CXX are absolute" 4Subject: [PATCH] Revert "cmd/go: make sure CC and CXX are absolute"
@@ -17,20 +17,20 @@ Upstream-Status: Inappropriate [OE-Specific]
17Signed-off-by: Khem Raj <raj.khem@gmail.com> 17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18--- 18---
19 src/cmd/go/internal/envcmd/env.go | 5 ----- 19 src/cmd/go/internal/envcmd/env.go | 5 -----
20 src/cmd/go/internal/work/init.go | 7 ------- 20 src/cmd/go/internal/work/init.go | 6 ------
21 src/cmd/go/testdata/script/env_write.txt | 24 ------------------------ 21 src/cmd/go/testdata/script/env_write.txt | 24 ------------------------
22 3 files changed, 36 deletions(-) 22 3 files changed, 35 deletions(-)
23 23
24diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go 24diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
25index 6937187522..29f9057c3f 100644 25index ff6f0d8..43b94e7 100644
26--- a/src/cmd/go/internal/envcmd/env.go 26--- a/src/cmd/go/internal/envcmd/env.go
27+++ b/src/cmd/go/internal/envcmd/env.go 27+++ b/src/cmd/go/internal/envcmd/env.go
28@@ -427,11 +427,6 @@ func checkEnvWrite(key, val string) error { 28@@ -457,11 +457,6 @@ func checkEnvWrite(key, val string) error {
29 if !filepath.IsAbs(val) && val != "" { 29 if !filepath.IsAbs(val) && val != "" {
30 return fmt.Errorf("GOPATH entry is relative; must be absolute path: %q", val) 30 return fmt.Errorf("GOPATH entry is relative; must be absolute path: %q", val)
31 } 31 }
32- // Make sure CC and CXX are absolute paths 32- // Make sure CC and CXX are absolute paths
33- case "CC", "CXX": 33- case "CC", "CXX", "GOMODCACHE":
34- if !filepath.IsAbs(val) && val != "" && val != filepath.Base(val) { 34- if !filepath.IsAbs(val) && val != "" && val != filepath.Base(val) {
35- return fmt.Errorf("%s entry is relative; must be absolute path: %q", key, val) 35- return fmt.Errorf("%s entry is relative; must be absolute path: %q", key, val)
36- } 36- }
@@ -38,10 +38,10 @@ index 6937187522..29f9057c3f 100644
38 38
39 if !utf8.ValidString(val) { 39 if !utf8.ValidString(val) {
40diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go 40diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go
41index ba7c7c2fbb..3a6df5f758 100644 41index 37a3e2d..316b0cf 100644
42--- a/src/cmd/go/internal/work/init.go 42--- a/src/cmd/go/internal/work/init.go
43+++ b/src/cmd/go/internal/work/init.go 43+++ b/src/cmd/go/internal/work/init.go
44@@ -41,13 +41,6 @@ func BuildInit() { 44@@ -39,12 +39,6 @@ func BuildInit() {
45 cfg.BuildPkgdir = p 45 cfg.BuildPkgdir = p
46 } 46 }
47 47
@@ -51,12 +51,11 @@ index ba7c7c2fbb..3a6df5f758 100644
51- base.Fatalf("go %s: %s environment variable is relative; must be absolute path: %s\n", flag.Args()[0], key, path) 51- base.Fatalf("go %s: %s environment variable is relative; must be absolute path: %s\n", flag.Args()[0], key, path)
52- } 52- }
53- } 53- }
54- 54 }
55 // For each experiment that has been enabled in the toolchain, define a 55
56 // build tag with the same name but prefixed by "goexperiment." which can be 56 func instrumentInit() {
57 // used for compiling alternative files for the experiment. This allows
58diff --git a/src/cmd/go/testdata/script/env_write.txt b/src/cmd/go/testdata/script/env_write.txt 57diff --git a/src/cmd/go/testdata/script/env_write.txt b/src/cmd/go/testdata/script/env_write.txt
59index bda1e57826..c99aadb7f2 100644 58index b5e9739..566c876 100644
60--- a/src/cmd/go/testdata/script/env_write.txt 59--- a/src/cmd/go/testdata/script/env_write.txt
61+++ b/src/cmd/go/testdata/script/env_write.txt 60+++ b/src/cmd/go/testdata/script/env_write.txt
62@@ -129,30 +129,6 @@ go env -w GOTMPDIR= 61@@ -129,30 +129,6 @@ go env -w GOTMPDIR=
@@ -91,5 +90,5 @@ index bda1e57826..c99aadb7f2 100644
91 env GOOS= 90 env GOOS=
92 env GOARCH= 91 env GOARCH=
93-- 92--
942.30.1 932.20.1
95 94
diff --git a/meta/recipes-devtools/go/go-binary-native_1.16.10.bb b/meta/recipes-devtools/go/go-binary-native_1.17.3.bb
index 4866c9f847..1b43a804da 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.16.10.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.17.3.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
8PROVIDES = "go-native" 8PROVIDES = "go-native"
9 9
10SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" 10SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
11SRC_URI[go_linux_amd64.sha256sum] = "414cd18ce1d193769b9e97d2401ad718755ab47816e13b2a1cde203d263b55cf" 11SRC_URI[go_linux_amd64.sha256sum] = "550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c"
12SRC_URI[go_linux_arm64.sha256sum] = "bfe1d4b82626c742b4690a832ca59a21e3d702161556f3c0ed26dffb368927e9" 12SRC_URI[go_linux_arm64.sha256sum] = "06f505c8d27203f78706ad04e47050b49092f1b06dc9ac4fbee4f0e4d015c8d4"
13 13
14UPSTREAM_CHECK_URI = "https://golang.org/dl/" 14UPSTREAM_CHECK_URI = "https://golang.org/dl/"
15UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" 15UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.16.10.bb b/meta/recipes-devtools/go/go-cross-canadian_1.17.3.bb
index 7ac9449e47..7ac9449e47 100644
--- a/meta/recipes-devtools/go/go-cross-canadian_1.16.10.bb
+++ b/meta/recipes-devtools/go/go-cross-canadian_1.17.3.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.16.10.bb b/meta/recipes-devtools/go/go-cross_1.17.3.bb
index 80b5a03f6c..80b5a03f6c 100644
--- a/meta/recipes-devtools/go/go-cross_1.16.10.bb
+++ b/meta/recipes-devtools/go/go-cross_1.17.3.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.16.10.bb b/meta/recipes-devtools/go/go-crosssdk_1.17.3.bb
index 1857c8a577..1857c8a577 100644
--- a/meta/recipes-devtools/go/go-crosssdk_1.16.10.bb
+++ b/meta/recipes-devtools/go/go-crosssdk_1.17.3.bb
diff --git a/meta/recipes-devtools/go/go-native_1.16.10.bb b/meta/recipes-devtools/go/go-native_1.17.3.bb
index ffe4ef3523..ffe4ef3523 100644
--- a/meta/recipes-devtools/go/go-native_1.16.10.bb
+++ b/meta/recipes-devtools/go/go-native_1.17.3.bb
diff --git a/meta/recipes-devtools/go/go-runtime_1.16.10.bb b/meta/recipes-devtools/go/go-runtime_1.17.3.bb
index 63464a1501..63464a1501 100644
--- a/meta/recipes-devtools/go/go-runtime_1.16.10.bb
+++ b/meta/recipes-devtools/go/go-runtime_1.17.3.bb
diff --git a/meta/recipes-devtools/go/go_1.16.10.bb b/meta/recipes-devtools/go/go_1.17.3.bb
index 34dc89bb0c..34dc89bb0c 100644
--- a/meta/recipes-devtools/go/go_1.16.10.bb
+++ b/meta/recipes-devtools/go/go_1.17.3.bb