diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-02-27 00:05:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-28 23:11:29 +0000 |
commit | 12477b74e57b93e5735a98ba82264f6fc9c09cbd (patch) | |
tree | 668568540e7fba1b4fc84e7907b06d2958b4a6cb /meta/recipes-devtools/go | |
parent | cfd64145801580898a179f1d235512d4b5917379 (diff) | |
download | poky-12477b74e57b93e5735a98ba82264f6fc9c09cbd.tar.gz |
go: Update to 1.14 release series
(From OE-Core rev: 3daa9684e458b9c926e1a07acd9b1c0fe8bd2e86)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go')
-rw-r--r-- | meta/recipes-devtools/go/go-1.14.inc (renamed from meta/recipes-devtools/go/go-1.13.inc) | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch (renamed from meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch) | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (renamed from meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch) | 33 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (renamed from meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch) | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch (renamed from meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch) | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (renamed from meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch) | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch (renamed from meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch) | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch (renamed from meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch) | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch (renamed from meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch) | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch (renamed from meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch) | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-cross-canadian_1.14.bb (renamed from meta/recipes-devtools/go/go-cross-canadian_1.13.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-cross_1.14.bb (renamed from meta/recipes-devtools/go/go-cross_1.13.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-crosssdk_1.14.bb (renamed from meta/recipes-devtools/go/go-crosssdk_1.13.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-native_1.14.bb (renamed from meta/recipes-devtools/go/go-native_1.13.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-runtime_1.14.bb (renamed from meta/recipes-devtools/go/go-runtime_1.13.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go_1.14.bb (renamed from meta/recipes-devtools/go/go_1.13.bb) | 0 |
16 files changed, 52 insertions, 119 deletions
diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.14.inc index 7780aced89..ac7b95cf03 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.14.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | require go-common.inc | 1 | require go-common.inc |
2 | 2 | ||
3 | GO_BASEVERSION = "1.13" | 3 | GO_BASEVERSION = "1.14" |
4 | GO_MINOR = ".8" | 4 | GO_MINOR = "" |
5 | PV .= "${GO_MINOR}" | 5 | PV .= "${GO_MINOR}" |
6 | FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" | 6 | FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" |
7 | 7 | ||
@@ -19,5 +19,5 @@ SRC_URI += "\ | |||
19 | " | 19 | " |
20 | SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" | 20 | SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" |
21 | 21 | ||
22 | SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" | 22 | SRC_URI[main.md5sum] = "7c97bdb3b5218a5089612efb3ed30345" |
23 | SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" | 23 | SRC_URI[main.sha256sum] = "6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389" |
diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch index ddfd5e41d1..d47664d8e2 100644 --- a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch | |||
@@ -15,11 +15,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
15 | src/cmd/go/internal/envcmd/env.go | 4 ++-- | 15 | src/cmd/go/internal/envcmd/env.go | 4 ++-- |
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
17 | 17 | ||
18 | diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go | ||
19 | index 17852de..7b5ec5e 100644 | ||
20 | --- a/src/cmd/go/internal/envcmd/env.go | 18 | --- a/src/cmd/go/internal/envcmd/env.go |
21 | +++ b/src/cmd/go/internal/envcmd/env.go | 19 | +++ b/src/cmd/go/internal/envcmd/env.go |
22 | @@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar { | 20 | @@ -102,11 +102,11 @@ func MkEnv() []cfg.EnvVar { |
23 | 21 | ||
24 | cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) | 22 | cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch) |
25 | if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { | 23 | if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 { |
@@ -33,6 +31,3 @@ index 17852de..7b5ec5e 100644 | |||
33 | } | 31 | } |
34 | env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) | 32 | env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")}) |
35 | env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) | 33 | env = append(env, cfg.EnvVar{Name: "CC", Value: cc}) |
36 | -- | ||
37 | 2.17.1 (Apple Git-112) | ||
38 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch index 4eddd39809..9e88567ebd 100644 --- a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go-1.14/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch | |||
@@ -50,11 +50,9 @@ 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 | ||
53 | diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go | ||
54 | index 7b5ec5e..292f117 100644 | ||
55 | --- a/src/cmd/go/internal/envcmd/env.go | 53 | --- a/src/cmd/go/internal/envcmd/env.go |
56 | +++ b/src/cmd/go/internal/envcmd/env.go | 54 | +++ b/src/cmd/go/internal/envcmd/env.go |
57 | @@ -154,7 +154,7 @@ func ExtraEnvVars() []cfg.EnvVar { | 55 | @@ -156,7 +156,7 @@ func ExtraEnvVars() []cfg.EnvVar { |
58 | func ExtraEnvVarsCostly() []cfg.EnvVar { | 56 | func ExtraEnvVarsCostly() []cfg.EnvVar { |
59 | var b work.Builder | 57 | var b work.Builder |
60 | b.Init() | 58 | b.Init() |
@@ -63,8 +61,6 @@ index 7b5ec5e..292f117 100644 | |||
63 | if err != nil { | 61 | if err != nil { |
64 | // Should not happen - b.CFlags was given an empty package. | 62 | // Should not happen - b.CFlags was given an empty package. |
65 | fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) | 63 | fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) |
66 | diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go | ||
67 | index 7dd9a90..ccebaf8 100644 | ||
68 | --- a/src/cmd/go/internal/work/exec.go | 64 | --- a/src/cmd/go/internal/work/exec.go |
69 | +++ b/src/cmd/go/internal/work/exec.go | 65 | +++ b/src/cmd/go/internal/work/exec.go |
70 | @@ -32,6 +32,8 @@ import ( | 66 | @@ -32,6 +32,8 @@ import ( |
@@ -76,16 +72,16 @@ index 7dd9a90..ccebaf8 100644 | |||
76 | // actionList returns the list of actions in the dag rooted at root | 72 | // actionList returns the list of actions in the dag rooted at root |
77 | // as visited in a depth-first post-order traversal. | 73 | // as visited in a depth-first post-order traversal. |
78 | func actionList(root *Action) []*Action { | 74 | func actionList(root *Action) []*Action { |
79 | @@ -205,7 +207,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { | 75 | @@ -208,7 +210,7 @@ func (b *Builder) buildActionID(a *Actio |
80 | // The compiler hides the exact value of $GOROOT | ||
81 | // when building things in GOROOT. | ||
82 | // Assume b.WorkDir is being trimmed properly. | 76 | // Assume b.WorkDir is being trimmed properly. |
77 | // When -trimpath is used with a package built from the module cache, | ||
78 | // use the module path and version instead of the directory. | ||
83 | - if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { | 79 | - if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { |
84 | + if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { | 80 | + if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) { |
85 | fmt.Fprintf(h, "dir %s\n", p.Dir) | 81 | fmt.Fprintf(h, "dir %s\n", p.Dir) |
86 | } | 82 | } else if cfg.BuildTrimpath && p.Module != nil { |
87 | fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) | 83 | fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) |
88 | @@ -219,13 +221,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID { | 84 | @@ -224,13 +226,13 @@ func (b *Builder) buildActionID(a *Actio |
89 | } | 85 | } |
90 | if len(p.CgoFiles)+len(p.SwigFiles) > 0 { | 86 | if len(p.CgoFiles)+len(p.SwigFiles) > 0 { |
91 | fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) | 87 | fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo")) |
@@ -103,7 +99,7 @@ index 7dd9a90..ccebaf8 100644 | |||
103 | } | 99 | } |
104 | // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? | 100 | // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? |
105 | } | 101 | } |
106 | @@ -2229,33 +2231,48 @@ var ( | 102 | @@ -2228,33 +2230,48 @@ var ( |
107 | // gccCmd returns a gcc command line prefix | 103 | // gccCmd returns a gcc command line prefix |
108 | // defaultCC is defined in zdefaultcc.go, written by cmd/dist. | 104 | // defaultCC is defined in zdefaultcc.go, written by cmd/dist. |
109 | func (b *Builder) GccCmd(incdir, workdir string) []string { | 105 | func (b *Builder) GccCmd(incdir, workdir string) []string { |
@@ -161,7 +157,7 @@ index 7dd9a90..ccebaf8 100644 | |||
161 | } | 157 | } |
162 | 158 | ||
163 | // compilerExe returns the compiler to use given an | 159 | // compilerExe returns the compiler to use given an |
164 | @@ -2264,11 +2281,16 @@ func (b *Builder) fcExe() []string { | 160 | @@ -2263,11 +2280,16 @@ func (b *Builder) fcExe() []string { |
165 | // of the compiler but can have additional arguments if they | 161 | // of the compiler but can have additional arguments if they |
166 | // were present in the environment value. | 162 | // were present in the environment value. |
167 | // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. | 163 | // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"]. |
@@ -179,7 +175,7 @@ index 7dd9a90..ccebaf8 100644 | |||
179 | return compiler | 175 | return compiler |
180 | } | 176 | } |
181 | 177 | ||
182 | @@ -2429,7 +2451,7 @@ func envList(key, def string) []string { | 178 | @@ -2428,7 +2450,7 @@ func envList(key, def string) []string { |
183 | } | 179 | } |
184 | 180 | ||
185 | // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. | 181 | // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo. |
@@ -188,7 +184,7 @@ index 7dd9a90..ccebaf8 100644 | |||
188 | defaults := "-g -O2" | 184 | defaults := "-g -O2" |
189 | 185 | ||
190 | if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { | 186 | if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { |
191 | @@ -2448,6 +2470,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l | 187 | @@ -2447,6 +2469,14 @@ func (b *Builder) CFlags(p *load.Package |
192 | return | 188 | return |
193 | } | 189 | } |
194 | 190 | ||
@@ -203,7 +199,7 @@ index 7dd9a90..ccebaf8 100644 | |||
203 | return | 199 | return |
204 | } | 200 | } |
205 | 201 | ||
206 | @@ -2462,7 +2492,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) | 202 | @@ -2461,7 +2491,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) |
207 | 203 | ||
208 | func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { | 204 | func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { |
209 | p := a.Package | 205 | p := a.Package |
@@ -212,7 +208,7 @@ index 7dd9a90..ccebaf8 100644 | |||
212 | if err != nil { | 208 | if err != nil { |
213 | return nil, nil, err | 209 | return nil, nil, err |
214 | } | 210 | } |
215 | @@ -2821,7 +2851,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { | 211 | @@ -2820,7 +2850,7 @@ func (b *Builder) swigIntSize(objdir str |
216 | 212 | ||
217 | // Run SWIG on one SWIG input file. | 213 | // Run SWIG on one SWIG input file. |
218 | func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { | 214 | func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { |
@@ -221,6 +217,3 @@ index 7dd9a90..ccebaf8 100644 | |||
221 | if err != nil { | 217 | if err != nil { |
222 | return "", "", err | 218 | return "", "", err |
223 | } | 219 | } |
224 | -- | ||
225 | 2.17.1 (Apple Git-112) | ||
226 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch index 9aa0119ae9..662c705471 100644 --- a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +++ b/meta/recipes-devtools/go/go-1.14/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch | |||
@@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
17 | src/cmd/go/internal/cfg/cfg.go | 6 +++++- | 17 | src/cmd/go/internal/cfg/cfg.go | 6 +++++- |
18 | 2 files changed, 8 insertions(+), 2 deletions(-) | 18 | 2 files changed, 8 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go | ||
21 | index 9e50311..683ca6f 100644 | ||
22 | --- a/src/cmd/dist/build.go | 20 | --- a/src/cmd/dist/build.go |
23 | +++ b/src/cmd/dist/build.go | 21 | +++ b/src/cmd/dist/build.go |
24 | @@ -244,7 +244,9 @@ func xinit() { | 22 | @@ -246,7 +246,9 @@ func xinit() { |
25 | workdir = xworkdir() | 23 | workdir = xworkdir() |
26 | xatexit(rmworkdir) | 24 | xatexit(rmworkdir) |
27 | 25 | ||
@@ -32,11 +30,9 @@ index 9e50311..683ca6f 100644 | |||
32 | } | 30 | } |
33 | 31 | ||
34 | // compilerEnv returns a map from "goos/goarch" to the | 32 | // compilerEnv returns a map from "goos/goarch" to the |
35 | diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go | ||
36 | index a3277a6..db96350 100644 | ||
37 | --- a/src/cmd/go/internal/cfg/cfg.go | 33 | --- a/src/cmd/go/internal/cfg/cfg.go |
38 | +++ b/src/cmd/go/internal/cfg/cfg.go | 34 | +++ b/src/cmd/go/internal/cfg/cfg.go |
39 | @@ -60,7 +60,11 @@ func defaultContext() build.Context { | 35 | @@ -64,7 +64,11 @@ func defaultContext() build.Context { |
40 | // variables. This matches the initialization of ToolDir in | 36 | // variables. This matches the initialization of ToolDir in |
41 | // go/build, except for using ctxt.GOROOT rather than | 37 | // go/build, except for using ctxt.GOROOT rather than |
42 | // runtime.GOROOT. | 38 | // runtime.GOROOT. |
@@ -49,6 +45,3 @@ index a3277a6..db96350 100644 | |||
49 | } | 45 | } |
50 | 46 | ||
51 | ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) | 47 | ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH) |
52 | -- | ||
53 | 2.17.1 (Apple Git-112) | ||
54 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch index 40763ad5b1..75c9c75211 100644 --- a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch +++ b/meta/recipes-devtools/go/go-1.14/0004-ld-add-soname-to-shareable-objects.patch | |||
@@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
17 | src/cmd/link/internal/ld/lib.go | 3 +++ | 17 | src/cmd/link/internal/ld/lib.go | 3 +++ |
18 | 1 file changed, 3 insertions(+) | 18 | 1 file changed, 3 insertions(+) |
19 | 19 | ||
20 | diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go | ||
21 | index 3fa258d..f96fb02 100644 | ||
22 | --- a/src/cmd/link/internal/ld/lib.go | 20 | --- a/src/cmd/link/internal/ld/lib.go |
23 | +++ b/src/cmd/link/internal/ld/lib.go | 21 | +++ b/src/cmd/link/internal/ld/lib.go |
24 | @@ -1215,6 +1215,7 @@ func (ctxt *Link) hostlink() { | 22 | @@ -1280,6 +1280,7 @@ func (ctxt *Link) hostlink() { |
25 | argv = append(argv, "-Wl,-z,relro") | 23 | argv = append(argv, "-Wl,-z,relro") |
26 | } | 24 | } |
27 | argv = append(argv, "-shared") | 25 | argv = append(argv, "-shared") |
@@ -29,7 +27,7 @@ index 3fa258d..f96fb02 100644 | |||
29 | if ctxt.HeadType != objabi.Hwindows { | 27 | if ctxt.HeadType != objabi.Hwindows { |
30 | // Pass -z nodelete to mark the shared library as | 28 | // Pass -z nodelete to mark the shared library as |
31 | // non-closeable: a dlclose will do nothing. | 29 | // non-closeable: a dlclose will do nothing. |
32 | @@ -1226,6 +1227,7 @@ func (ctxt *Link) hostlink() { | 30 | @@ -1291,6 +1292,7 @@ func (ctxt *Link) hostlink() { |
33 | argv = append(argv, "-Wl,-z,relro") | 31 | argv = append(argv, "-Wl,-z,relro") |
34 | } | 32 | } |
35 | argv = append(argv, "-shared") | 33 | argv = append(argv, "-shared") |
@@ -37,7 +35,7 @@ index 3fa258d..f96fb02 100644 | |||
37 | case BuildModePlugin: | 35 | case BuildModePlugin: |
38 | if ctxt.HeadType == objabi.Hdarwin { | 36 | if ctxt.HeadType == objabi.Hdarwin { |
39 | argv = append(argv, "-dynamiclib") | 37 | argv = append(argv, "-dynamiclib") |
40 | @@ -1234,6 +1236,7 @@ func (ctxt *Link) hostlink() { | 38 | @@ -1299,6 +1301,7 @@ func (ctxt *Link) hostlink() { |
41 | argv = append(argv, "-Wl,-z,relro") | 39 | argv = append(argv, "-Wl,-z,relro") |
42 | } | 40 | } |
43 | argv = append(argv, "-shared") | 41 | argv = append(argv, "-shared") |
@@ -45,6 +43,3 @@ index 3fa258d..f96fb02 100644 | |||
45 | } | 43 | } |
46 | } | 44 | } |
47 | 45 | ||
48 | -- | ||
49 | 2.17.1 (Apple Git-112) | ||
50 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch index 4f2a46c6ce..59c12d9546 100644 --- a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +++ b/meta/recipes-devtools/go/go-1.14/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch | |||
@@ -17,11 +17,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
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 | ||
20 | diff --git a/src/make.bash b/src/make.bash | ||
21 | index 92d1481..0c2822f 100755 | ||
22 | --- a/src/make.bash | 20 | --- a/src/make.bash |
23 | +++ b/src/make.bash | 21 | +++ b/src/make.bash |
24 | @@ -177,7 +177,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then | 22 | @@ -178,7 +178,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; |
25 | exit 1 | 23 | exit 1 |
26 | fi | 24 | fi |
27 | rm -f cmd/dist/dist | 25 | rm -f cmd/dist/dist |
@@ -30,7 +28,7 @@ index 92d1481..0c2822f 100755 | |||
30 | 28 | ||
31 | # -e doesn't propagate out of eval, so check success by hand. | 29 | # -e doesn't propagate out of eval, so check success by hand. |
32 | eval $(./cmd/dist/dist env -p || echo FAIL=true) | 30 | eval $(./cmd/dist/dist env -p || echo FAIL=true) |
33 | @@ -208,7 +208,7 @@ fi | 31 | @@ -209,7 +209,7 @@ fi |
34 | # Run dist bootstrap to complete make.bash. | 32 | # Run dist bootstrap to complete make.bash. |
35 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. | 33 | # Bootstrap installs a proper cmd/dist, built with the new toolchain. |
36 | # Throw ours, built with Go 1.4, away after bootstrap. | 34 | # Throw ours, built with Go 1.4, away after bootstrap. |
@@ -39,6 +37,3 @@ index 92d1481..0c2822f 100755 | |||
39 | rm -f ./cmd/dist/dist | 37 | rm -f ./cmd/dist/dist |
40 | 38 | ||
41 | # DO NOT ADD ANY NEW CODE HERE. | 39 | # DO NOT ADD ANY NEW CODE HERE. |
42 | -- | ||
43 | 2.17.1 (Apple Git-112) | ||
44 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch index 354aaca3a1..7aee0bac43 100644 --- a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch +++ b/meta/recipes-devtools/go/go-1.14/0006-cmd-dist-separate-host-and-target-builds.patch | |||
@@ -38,8 +38,6 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
38 | src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ | 38 | src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------ |
39 | 1 file changed, 112 insertions(+), 43 deletions(-) | 39 | 1 file changed, 112 insertions(+), 43 deletions(-) |
40 | 40 | ||
41 | diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go | ||
42 | index 683ca6f..0ad082b 100644 | ||
43 | --- a/src/cmd/dist/build.go | 41 | --- a/src/cmd/dist/build.go |
44 | +++ b/src/cmd/dist/build.go | 42 | +++ b/src/cmd/dist/build.go |
45 | @@ -41,6 +41,7 @@ var ( | 43 | @@ -41,6 +41,7 @@ var ( |
@@ -58,7 +56,7 @@ index 683ca6f..0ad082b 100644 | |||
58 | 56 | ||
59 | vflag int // verbosity | 57 | vflag int // verbosity |
60 | ) | 58 | ) |
61 | @@ -247,6 +249,8 @@ func xinit() { | 59 | @@ -249,6 +251,8 @@ func xinit() { |
62 | if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { | 60 | if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" { |
63 | tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) | 61 | tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch) |
64 | } | 62 | } |
@@ -67,7 +65,7 @@ index 683ca6f..0ad082b 100644 | |||
67 | } | 65 | } |
68 | 66 | ||
69 | // compilerEnv returns a map from "goos/goarch" to the | 67 | // compilerEnv returns a map from "goos/goarch" to the |
70 | @@ -478,8 +482,10 @@ func setup() { | 68 | @@ -480,8 +484,10 @@ func setup() { |
71 | p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) | 69 | p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch) |
72 | if rebuildall { | 70 | if rebuildall { |
73 | xremoveall(p) | 71 | xremoveall(p) |
@@ -78,7 +76,7 @@ index 683ca6f..0ad082b 100644 | |||
78 | 76 | ||
79 | if goos != gohostos || goarch != gohostarch { | 77 | if goos != gohostos || goarch != gohostarch { |
80 | p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) | 78 | p := pathf("%s/pkg/%s_%s", goroot, goos, goarch) |
81 | @@ -1207,12 +1213,29 @@ func cmdbootstrap() { | 79 | @@ -1244,12 +1250,29 @@ func cmdbootstrap() { |
82 | 80 | ||
83 | var noBanner bool | 81 | var noBanner bool |
84 | var debug bool | 82 | var debug bool |
@@ -109,7 +107,7 @@ index 683ca6f..0ad082b 100644 | |||
109 | // Set GOPATH to an internal directory. We shouldn't actually | 107 | // Set GOPATH to an internal directory. We shouldn't actually |
110 | // need to store files here, since the toolchain won't | 108 | // need to store files here, since the toolchain won't |
111 | // depend on modules outside of vendor directories, but if | 109 | // depend on modules outside of vendor directories, but if |
112 | @@ -1266,8 +1289,13 @@ func cmdbootstrap() { | 110 | @@ -1303,8 +1326,13 @@ func cmdbootstrap() { |
113 | xprintf("\n") | 111 | xprintf("\n") |
114 | } | 112 | } |
115 | 113 | ||
@@ -125,7 +123,7 @@ index 683ca6f..0ad082b 100644 | |||
125 | goBootstrap := pathf("%s/go_bootstrap", tooldir) | 123 | goBootstrap := pathf("%s/go_bootstrap", tooldir) |
126 | cmdGo := pathf("%s/go", gobin) | 124 | cmdGo := pathf("%s/go", gobin) |
127 | if debug { | 125 | if debug { |
128 | @@ -1296,7 +1324,11 @@ func cmdbootstrap() { | 126 | @@ -1333,7 +1361,11 @@ func cmdbootstrap() { |
129 | xprintf("\n") | 127 | xprintf("\n") |
130 | } | 128 | } |
131 | xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") | 129 | xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n") |
@@ -138,7 +136,7 @@ index 683ca6f..0ad082b 100644 | |||
138 | goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) | 136 | goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...) |
139 | if debug { | 137 | if debug { |
140 | run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") | 138 | run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") |
141 | @@ -1333,50 +1365,84 @@ func cmdbootstrap() { | 139 | @@ -1370,50 +1402,84 @@ func cmdbootstrap() { |
142 | } | 140 | } |
143 | checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) | 141 | checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) |
144 | 142 | ||
@@ -190,8 +188,6 @@ index 683ca6f..0ad082b 100644 | |||
190 | - timelog("build", "host toolchain") | 188 | - timelog("build", "host toolchain") |
191 | - if vflag > 0 { | 189 | - if vflag > 0 { |
192 | - xprintf("\n") | 190 | - xprintf("\n") |
193 | - } | ||
194 | - xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) | ||
195 | + | 191 | + |
196 | + if goos == oldgoos && goarch == oldgoarch { | 192 | + if goos == oldgoos && goarch == oldgoarch { |
197 | + // Common case - not setting up for cross-compilation. | 193 | + // Common case - not setting up for cross-compilation. |
@@ -223,7 +219,8 @@ index 683ca6f..0ad082b 100644 | |||
223 | + os.Setenv("GOARCH", goarch) | 219 | + os.Setenv("GOARCH", goarch) |
224 | + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) | 220 | + os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch)) |
225 | + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) | 221 | + xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch) |
226 | + } | 222 | } |
223 | - xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch) | ||
227 | goInstall(goBootstrap, "std", "cmd") | 224 | goInstall(goBootstrap, "std", "cmd") |
228 | checkNotStale(goBootstrap, "std", "cmd") | 225 | checkNotStale(goBootstrap, "std", "cmd") |
229 | checkNotStale(cmdGo, "std", "cmd") | 226 | checkNotStale(cmdGo, "std", "cmd") |
@@ -231,12 +228,7 @@ index 683ca6f..0ad082b 100644 | |||
231 | - timelog("build", "target toolchain") | 228 | - timelog("build", "target toolchain") |
232 | - if vflag > 0 { | 229 | - if vflag > 0 { |
233 | - xprintf("\n") | 230 | - xprintf("\n") |
234 | + if debug { | 231 | - } |
235 | + run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full") | ||
236 | + run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) | ||
237 | + checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) | ||
238 | + copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) | ||
239 | } | ||
240 | - goos = oldgoos | 232 | - goos = oldgoos |
241 | - goarch = oldgoarch | 233 | - goarch = oldgoarch |
242 | - os.Setenv("GOOS", goos) | 234 | - os.Setenv("GOOS", goos) |
@@ -257,10 +249,16 @@ index 683ca6f..0ad082b 100644 | |||
257 | - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) | 249 | - run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch)) |
258 | - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) | 250 | - checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...) |
259 | - copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec) | 251 | - 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 | + } | ||
260 | } | 258 | } |
261 | 259 | ||
262 | // Check that there are no new files in $GOROOT/bin other than | 260 | // Check that there are no new files in $GOROOT/bin other than |
263 | @@ -1393,8 +1459,11 @@ func cmdbootstrap() { | 261 | @@ -1430,8 +1496,11 @@ func cmdbootstrap() { |
264 | } | 262 | } |
265 | } | 263 | } |
266 | 264 | ||
@@ -274,6 +272,3 @@ index 683ca6f..0ad082b 100644 | |||
274 | 272 | ||
275 | if goos == "android" { | 273 | if goos == "android" { |
276 | // Make sure the exec wrapper will sync a fresh $GOROOT to the device. | 274 | // Make sure the exec wrapper will sync a fresh $GOROOT to the device. |
277 | -- | ||
278 | 2.17.1 (Apple Git-112) | ||
279 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch index e232c79199..b93f83de69 100644 --- a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go-1.14/0007-cmd-go-make-GOROOT-precious-by-default.patch | |||
@@ -27,11 +27,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
27 | src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ | 27 | src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++ |
28 | 3 files changed, 34 insertions(+) | 28 | 3 files changed, 34 insertions(+) |
29 | 29 | ||
30 | diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go | ||
31 | index 33b7818..7617b4c 100644 | ||
32 | --- a/src/cmd/go/internal/work/action.go | 30 | --- a/src/cmd/go/internal/work/action.go |
33 | +++ b/src/cmd/go/internal/work/action.go | 31 | +++ b/src/cmd/go/internal/work/action.go |
34 | @@ -662,6 +662,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) { | 32 | @@ -670,6 +670,9 @@ func (b *Builder) addTransitiveLinkDeps( |
35 | if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { | 33 | if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] { |
36 | continue | 34 | continue |
37 | } | 35 | } |
@@ -41,11 +39,9 @@ index 33b7818..7617b4c 100644 | |||
41 | haveShlib[filepath.Base(p1.Shlib)] = true | 39 | haveShlib[filepath.Base(p1.Shlib)] = true |
42 | // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, | 40 | // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild, |
43 | // we'll end up building an overall library or executable that depends at runtime | 41 | // we'll end up building an overall library or executable that depends at runtime |
44 | diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go | ||
45 | index 9305b2d..6560317 100644 | ||
46 | --- a/src/cmd/go/internal/work/build.go | 42 | --- a/src/cmd/go/internal/work/build.go |
47 | +++ b/src/cmd/go/internal/work/build.go | 43 | +++ b/src/cmd/go/internal/work/build.go |
48 | @@ -155,6 +155,8 @@ See also: go install, go get, go clean. | 44 | @@ -167,6 +167,8 @@ See also: go install, go get, go clean. |
49 | 45 | ||
50 | const concurrentGCBackendCompilationEnabledByDefault = true | 46 | const concurrentGCBackendCompilationEnabledByDefault = true |
51 | 47 | ||
@@ -54,10 +50,10 @@ index 9305b2d..6560317 100644 | |||
54 | func init() { | 50 | func init() { |
55 | // break init cycle | 51 | // break init cycle |
56 | CmdBuild.Run = runBuild | 52 | CmdBuild.Run = runBuild |
57 | @@ -167,6 +169,10 @@ func init() { | 53 | @@ -179,6 +181,10 @@ func init() { |
58 | 54 | ||
59 | AddBuildFlags(CmdBuild) | 55 | AddBuildFlags(CmdBuild, DefaultBuildFlags) |
60 | AddBuildFlags(CmdInstall) | 56 | AddBuildFlags(CmdInstall, DefaultBuildFlags) |
61 | + | 57 | + |
62 | + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { | 58 | + if x := os.Getenv("GOROOT_OVERRIDE"); x != "" { |
63 | + goRootPrecious = false | 59 | + goRootPrecious = false |
@@ -65,11 +61,9 @@ index 9305b2d..6560317 100644 | |||
65 | } | 61 | } |
66 | 62 | ||
67 | // Note that flags consulted by other parts of the code | 63 | // Note that flags consulted by other parts of the code |
68 | diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go | ||
69 | index ccebaf8..59450d7 100644 | ||
70 | --- a/src/cmd/go/internal/work/exec.go | 64 | --- a/src/cmd/go/internal/work/exec.go |
71 | +++ b/src/cmd/go/internal/work/exec.go | 65 | +++ b/src/cmd/go/internal/work/exec.go |
72 | @@ -455,6 +455,23 @@ func (b *Builder) build(a *Action) (err error) { | 66 | @@ -464,6 +464,23 @@ func (b *Builder) build(a *Action) (err |
73 | return errors.New("binary-only packages are no longer supported") | 67 | return errors.New("binary-only packages are no longer supported") |
74 | } | 68 | } |
75 | 69 | ||
@@ -93,7 +87,7 @@ index ccebaf8..59450d7 100644 | |||
93 | if err := b.Mkdir(a.Objdir); err != nil { | 87 | if err := b.Mkdir(a.Objdir); err != nil { |
94 | return err | 88 | return err |
95 | } | 89 | } |
96 | @@ -1499,6 +1516,14 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) { | 90 | @@ -1493,6 +1510,14 @@ func BuildInstallFunc(b *Builder, a *Act |
97 | return nil | 91 | return nil |
98 | } | 92 | } |
99 | 93 | ||
@@ -108,6 +102,3 @@ index ccebaf8..59450d7 100644 | |||
108 | if err := b.Mkdir(a.Objdir); err != nil { | 102 | if err := b.Mkdir(a.Objdir); err != nil { |
109 | return err | 103 | return err |
110 | } | 104 | } |
111 | -- | ||
112 | 2.17.1 (Apple Git-112) | ||
113 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch index 68e132f30a..b15d9812aa 100644 --- a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.14/0008-use-GOBUILDMODE-to-set-buildmode.patch | |||
@@ -23,11 +23,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
23 | src/cmd/go/internal/work/build.go | 8 +++++++- | 23 | src/cmd/go/internal/work/build.go | 8 +++++++- |
24 | 1 file changed, 7 insertions(+), 1 deletion(-) | 24 | 1 file changed, 7 insertions(+), 1 deletion(-) |
25 | 25 | ||
26 | diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go | ||
27 | index 6560317..5f3a988 100644 | ||
28 | --- a/src/cmd/go/internal/work/build.go | 26 | --- a/src/cmd/go/internal/work/build.go |
29 | +++ b/src/cmd/go/internal/work/build.go | 27 | +++ b/src/cmd/go/internal/work/build.go |
30 | @@ -231,7 +231,13 @@ func AddBuildFlags(cmd *base.Command) { | 28 | @@ -251,7 +251,13 @@ func AddBuildFlags(cmd *base.Command, ma |
31 | 29 | ||
32 | cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") | 30 | cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") |
33 | cmd.Flag.Var(buildCompiler{}, "compiler", "") | 31 | cmd.Flag.Var(buildCompiler{}, "compiler", "") |
@@ -41,7 +39,4 @@ index 6560317..5f3a988 100644 | |||
41 | + | 39 | + |
42 | cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") | 40 | cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") |
43 | cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") | 41 | cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") |
44 | cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") | 42 | if mask&OmitModFlag == 0 { |
45 | -- | ||
46 | 2.17.1 (Apple Git-112) | ||
47 | |||
diff --git a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch index 4bb1106f09..427cfb0dd2 100644 --- a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch +++ b/meta/recipes-devtools/go/go-1.14/0009-ld-replace-glibc-dynamic-linker-with-musl.patch | |||
@@ -25,11 +25,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com> | |||
25 | src/cmd/link/internal/x86/obj.go | 2 +- | 25 | src/cmd/link/internal/x86/obj.go | 2 +- |
26 | 8 files changed, 8 insertions(+), 8 deletions(-) | 26 | 8 files changed, 8 insertions(+), 8 deletions(-) |
27 | 27 | ||
28 | diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go | ||
29 | index 23741eb..8e74576 100644 | ||
30 | --- a/src/cmd/link/internal/amd64/obj.go | 28 | --- a/src/cmd/link/internal/amd64/obj.go |
31 | +++ b/src/cmd/link/internal/amd64/obj.go | 29 | +++ b/src/cmd/link/internal/amd64/obj.go |
32 | @@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) { | 30 | @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { |
33 | PEreloc1: pereloc1, | 31 | PEreloc1: pereloc1, |
34 | TLSIEtoLE: tlsIEtoLE, | 32 | TLSIEtoLE: tlsIEtoLE, |
35 | 33 | ||
@@ -38,8 +36,6 @@ index 23741eb..8e74576 100644 | |||
38 | Freebsddynld: "/libexec/ld-elf.so.1", | 36 | Freebsddynld: "/libexec/ld-elf.so.1", |
39 | Openbsddynld: "/usr/libexec/ld.so", | 37 | Openbsddynld: "/usr/libexec/ld.so", |
40 | Netbsddynld: "/libexec/ld.elf_so", | 38 | Netbsddynld: "/libexec/ld.elf_so", |
41 | diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go | ||
42 | index 45a406e..724d3e3 100644 | ||
43 | --- a/src/cmd/link/internal/arm/obj.go | 39 | --- a/src/cmd/link/internal/arm/obj.go |
44 | +++ b/src/cmd/link/internal/arm/obj.go | 40 | +++ b/src/cmd/link/internal/arm/obj.go |
45 | @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { | 41 | @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { |
@@ -51,8 +47,6 @@ index 45a406e..724d3e3 100644 | |||
51 | Freebsddynld: "/usr/libexec/ld-elf.so.1", | 47 | Freebsddynld: "/usr/libexec/ld-elf.so.1", |
52 | Openbsddynld: "/usr/libexec/ld.so", | 48 | Openbsddynld: "/usr/libexec/ld.so", |
53 | Netbsddynld: "/libexec/ld.elf_so", | 49 | Netbsddynld: "/libexec/ld.elf_so", |
54 | diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go | ||
55 | index 7c66623..d8b1db1 100644 | ||
56 | --- a/src/cmd/link/internal/arm64/obj.go | 50 | --- a/src/cmd/link/internal/arm64/obj.go |
57 | +++ b/src/cmd/link/internal/arm64/obj.go | 51 | +++ b/src/cmd/link/internal/arm64/obj.go |
58 | @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { | 52 | @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { |
@@ -62,10 +56,8 @@ index 7c66623..d8b1db1 100644 | |||
62 | - Linuxdynld: "/lib/ld-linux-aarch64.so.1", | 56 | - Linuxdynld: "/lib/ld-linux-aarch64.so.1", |
63 | + Linuxdynld: "/lib/ld-musl-aarch64.so.1", | 57 | + Linuxdynld: "/lib/ld-musl-aarch64.so.1", |
64 | 58 | ||
65 | Freebsddynld: "XXX", | 59 | Freebsddynld: "/usr/libexec/ld-elf.so.1", |
66 | Openbsddynld: "/usr/libexec/ld.so", | 60 | Openbsddynld: "/usr/libexec/ld.so", |
67 | diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go | ||
68 | index 231e1ff..631dd7a 100644 | ||
69 | --- a/src/cmd/link/internal/mips/obj.go | 61 | --- a/src/cmd/link/internal/mips/obj.go |
70 | +++ b/src/cmd/link/internal/mips/obj.go | 62 | +++ b/src/cmd/link/internal/mips/obj.go |
71 | @@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) { | 63 | @@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) { |
@@ -77,8 +69,6 @@ index 231e1ff..631dd7a 100644 | |||
77 | 69 | ||
78 | Freebsddynld: "XXX", | 70 | Freebsddynld: "XXX", |
79 | Openbsddynld: "XXX", | 71 | Openbsddynld: "XXX", |
80 | diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go | ||
81 | index 9604208..5ef3ffc 100644 | ||
82 | --- a/src/cmd/link/internal/mips64/obj.go | 72 | --- a/src/cmd/link/internal/mips64/obj.go |
83 | +++ b/src/cmd/link/internal/mips64/obj.go | 73 | +++ b/src/cmd/link/internal/mips64/obj.go |
84 | @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { | 74 | @@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) { |
@@ -90,8 +80,6 @@ index 9604208..5ef3ffc 100644 | |||
90 | Freebsddynld: "XXX", | 80 | Freebsddynld: "XXX", |
91 | Openbsddynld: "XXX", | 81 | Openbsddynld: "XXX", |
92 | Netbsddynld: "XXX", | 82 | Netbsddynld: "XXX", |
93 | diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go | ||
94 | index 51d1791..b15da85 100644 | ||
95 | --- a/src/cmd/link/internal/ppc64/obj.go | 83 | --- a/src/cmd/link/internal/ppc64/obj.go |
96 | +++ b/src/cmd/link/internal/ppc64/obj.go | 84 | +++ b/src/cmd/link/internal/ppc64/obj.go |
97 | @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) { | 85 | @@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) { |
@@ -103,8 +91,6 @@ index 51d1791..b15da85 100644 | |||
103 | 91 | ||
104 | Freebsddynld: "XXX", | 92 | Freebsddynld: "XXX", |
105 | Openbsddynld: "XXX", | 93 | Openbsddynld: "XXX", |
106 | diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go | ||
107 | index 3454476..42cc346 100644 | ||
108 | --- a/src/cmd/link/internal/s390x/obj.go | 94 | --- a/src/cmd/link/internal/s390x/obj.go |
109 | +++ b/src/cmd/link/internal/s390x/obj.go | 95 | +++ b/src/cmd/link/internal/s390x/obj.go |
110 | @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { | 96 | @@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) { |
@@ -116,8 +102,6 @@ index 3454476..42cc346 100644 | |||
116 | 102 | ||
117 | // not relevant for s390x | 103 | // not relevant for s390x |
118 | Freebsddynld: "XXX", | 104 | Freebsddynld: "XXX", |
119 | diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go | ||
120 | index f1fad20..d2ca10c 100644 | ||
121 | --- a/src/cmd/link/internal/x86/obj.go | 105 | --- a/src/cmd/link/internal/x86/obj.go |
122 | +++ b/src/cmd/link/internal/x86/obj.go | 106 | +++ b/src/cmd/link/internal/x86/obj.go |
123 | @@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) { | 107 | @@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) { |
@@ -129,6 +113,3 @@ index f1fad20..d2ca10c 100644 | |||
129 | Freebsddynld: "/usr/libexec/ld-elf.so.1", | 113 | Freebsddynld: "/usr/libexec/ld-elf.so.1", |
130 | Openbsddynld: "/usr/libexec/ld.so", | 114 | Openbsddynld: "/usr/libexec/ld.so", |
131 | Netbsddynld: "/usr/libexec/ld.elf_so", | 115 | Netbsddynld: "/usr/libexec/ld.elf_so", |
132 | -- | ||
133 | 2.17.1 (Apple Git-112) | ||
134 | |||
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.13.bb b/meta/recipes-devtools/go/go-cross-canadian_1.14.bb index 7ac9449e47..7ac9449e47 100644 --- a/meta/recipes-devtools/go/go-cross-canadian_1.13.bb +++ b/meta/recipes-devtools/go/go-cross-canadian_1.14.bb | |||
diff --git a/meta/recipes-devtools/go/go-cross_1.13.bb b/meta/recipes-devtools/go/go-cross_1.14.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/meta/recipes-devtools/go/go-cross_1.13.bb +++ b/meta/recipes-devtools/go/go-cross_1.14.bb | |||
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.13.bb b/meta/recipes-devtools/go/go-crosssdk_1.14.bb index 1857c8a577..1857c8a577 100644 --- a/meta/recipes-devtools/go/go-crosssdk_1.13.bb +++ b/meta/recipes-devtools/go/go-crosssdk_1.14.bb | |||
diff --git a/meta/recipes-devtools/go/go-native_1.13.bb b/meta/recipes-devtools/go/go-native_1.14.bb index bbf3c0dd73..bbf3c0dd73 100644 --- a/meta/recipes-devtools/go/go-native_1.13.bb +++ b/meta/recipes-devtools/go/go-native_1.14.bb | |||
diff --git a/meta/recipes-devtools/go/go-runtime_1.13.bb b/meta/recipes-devtools/go/go-runtime_1.14.bb index 43b68b4e46..43b68b4e46 100644 --- a/meta/recipes-devtools/go/go-runtime_1.13.bb +++ b/meta/recipes-devtools/go/go-runtime_1.14.bb | |||
diff --git a/meta/recipes-devtools/go/go_1.13.bb b/meta/recipes-devtools/go/go_1.14.bb index 5d40cf9d04..5d40cf9d04 100644 --- a/meta/recipes-devtools/go/go_1.13.bb +++ b/meta/recipes-devtools/go/go_1.14.bb | |||