summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/go/go-1.11.inc7
-rw-r--r--meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch6
-rw-r--r--meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch13
3 files changed, 11 insertions, 15 deletions
diff --git a/meta/recipes-devtools/go/go-1.11.inc b/meta/recipes-devtools/go/go-1.11.inc
index d626514ae6..d03e26cea0 100644
--- a/meta/recipes-devtools/go/go-1.11.inc
+++ b/meta/recipes-devtools/go/go-1.11.inc
@@ -1,7 +1,7 @@
1require go-common.inc 1require go-common.inc
2 2
3GO_BASEVERSION = "1.11" 3GO_BASEVERSION = "1.11"
4GO_MINOR = ".1" 4GO_MINOR = ".4"
5PV .= "${GO_MINOR}" 5PV .= "${GO_MINOR}"
6FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" 6FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
7 7
@@ -17,8 +17,7 @@ SRC_URI += "\
17 file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ 17 file://0007-cmd-go-make-GOROOT-precious-by-default.patch \
18 file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ 18 file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
19" 19"
20
21SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" 20SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
22 21
23SRC_URI[main.md5sum] = "eb9e9792247143705a7aacea9398cde0" 22SRC_URI[main.md5sum] = "a77697673215be465d1b583680ef2318"
24SRC_URI[main.sha256sum] = "558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117" 23SRC_URI[main.sha256sum] = "4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15"
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
65=================================================================== 65===================================================================
66--- go.orig/src/cmd/go/internal/work/exec.go 66--- go.orig/src/cmd/go/internal/work/exec.go
67+++ go/src/cmd/go/internal/work/exec.go 67+++ go/src/cmd/go/internal/work/exec.go
68@@ -440,6 +440,23 @@ func (b *Builder) build(a *Action) (err 68@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err
69 return fmt.Errorf("module requires Go %s", p.Module.GoVersion) 69 return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target)
70 } 70 }
71 71
72+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) { 72+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {
@@ -89,7 +89,7 @@ Index: go/src/cmd/go/internal/work/exec.go
89 if err := b.Mkdir(a.Objdir); err != nil { 89 if err := b.Mkdir(a.Objdir); err != nil {
90 return err 90 return err
91 } 91 }
92@@ -1435,6 +1452,14 @@ func BuildInstallFunc(b *Builder, a *Act 92@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act
93 return nil 93 return nil
94 } 94 }
95 95
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 <hongxu.jia@windriver.com>
18 src/cmd/go/internal/work/build.go | 6 +++++- 18 src/cmd/go/internal/work/build.go | 6 +++++-
19 1 file changed, 5 insertions(+), 1 deletion(-) 19 1 file changed, 5 insertions(+), 1 deletion(-)
20 20
21diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go 21Index: go/src/cmd/go/internal/work/build.go
22index 145b875..595d703 100644 22===================================================================
23--- a/src/cmd/go/internal/work/build.go 23--- go.orig/src/cmd/go/internal/work/build.go
24+++ b/src/cmd/go/internal/work/build.go 24+++ go/src/cmd/go/internal/work/build.go
25@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) { 25@@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) {
26 26
27 cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") 27 cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "")
28 cmd.Flag.Var(buildCompiler{}, "compiler", "") 28 cmd.Flag.Var(buildCompiler{}, "compiler", "")
@@ -35,6 +35,3 @@ index 145b875..595d703 100644
35 cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") 35 cmd.Flag.Var(&load.BuildGcflags, "gcflags", "")
36 cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") 36 cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "")
37 cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") 37 cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "")
38--
392.7.4
40