From b964551a0d08aa921d4e0ceea2f1e28a5e83510e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 16 Dec 2018 21:54:40 -0800 Subject: go: Upgrade 1.11.1 -> 1.11.4 minor release Changes: https://golang.org/doc/devel/release.html#go1.11 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../0007-cmd-go-make-GOROOT-precious-by-default.patch | 6 +++--- .../go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'meta/recipes-devtools/go/go-1.11') diff --git a/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch index f317e48a33..29ef947abd 100644 --- a/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch +++ b/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch @@ -65,8 +65,8 @@ Index: go/src/cmd/go/internal/work/exec.go =================================================================== --- go.orig/src/cmd/go/internal/work/exec.go +++ go/src/cmd/go/internal/work/exec.go -@@ -440,6 +440,23 @@ func (b *Builder) build(a *Action) (err - return fmt.Errorf("module requires Go %s", p.Module.GoVersion) +@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err + return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target) } + if goRootPrecious && (a.Package.Standard || a.Package.Goroot) { @@ -89,7 +89,7 @@ Index: go/src/cmd/go/internal/work/exec.go if err := b.Mkdir(a.Objdir); err != nil { return err } -@@ -1435,6 +1452,14 @@ func BuildInstallFunc(b *Builder, a *Act +@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act return nil } diff --git a/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch index b6ab504335..225cf439c5 100644 --- a/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -18,11 +18,11 @@ Signed-off-by: Hongxu Jia src/cmd/go/internal/work/build.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go -index 145b875..595d703 100644 ---- a/src/cmd/go/internal/work/build.go -+++ b/src/cmd/go/internal/work/build.go -@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) { +Index: go/src/cmd/go/internal/work/build.go +=================================================================== +--- go.orig/src/cmd/go/internal/work/build.go ++++ go/src/cmd/go/internal/work/build.go +@@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) { cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(buildCompiler{}, "compiler", "") @@ -35,6 +35,3 @@ index 145b875..595d703 100644 cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") --- -2.7.4 - -- cgit 1.2.3-korg