From 30e23e15563dcee2e9d8d559a55bff97079cf713 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 8 Sep 2017 18:04:33 -0300 Subject: go: Remove Go 1.6 and 1.7 releases The OE-Core has no reason to support multiple versions of Go as this increases the maintenance work and testing efforts. So we are going to support just a single version from now on which currently is 1.8.3. The 1.4 release is kept around as it is used for bootstrap, as such, it cannot be removed. (From OE-Core rev: 26abbf129d7ca0d36f6244f96fa8a572fd847899) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- .../go/go-1.7/fix-cc-handling.patch | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 meta/recipes-devtools/go/go-1.7/fix-cc-handling.patch (limited to 'meta/recipes-devtools/go/go-1.7/fix-cc-handling.patch') diff --git a/meta/recipes-devtools/go/go-1.7/fix-cc-handling.patch b/meta/recipes-devtools/go/go-1.7/fix-cc-handling.patch deleted file mode 100644 index a67caf41a5..0000000000 --- a/meta/recipes-devtools/go/go-1.7/fix-cc-handling.patch +++ /dev/null @@ -1,50 +0,0 @@ -Accept CC with multiple words in its name - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: go/src/cmd/go/build.go -=================================================================== ---- go.orig/src/cmd/go/build.go -+++ go/src/cmd/go/build.go -@@ -2991,12 +2991,24 @@ func (b *builder) gccCmd(objdir string) - return b.ccompilerCmd("CC", defaultCC, objdir) - } - -+// gccCmd returns a gcc command line prefix -+// defaultCC is defined in zdefaultcc.go, written by cmd/dist. -+func (b *builder) gccCmdForReal() []string { -+ return envList("CC", defaultCC) -+} -+ - // gxxCmd returns a g++ command line prefix - // defaultCXX is defined in zdefaultcc.go, written by cmd/dist. - func (b *builder) gxxCmd(objdir string) []string { - return b.ccompilerCmd("CXX", defaultCXX, objdir) - } - -+// gxxCmd returns a g++ command line prefix -+// defaultCXX is defined in zdefaultcc.go, written by cmd/dist. -+func (b *builder) gxxCmdForReal() []string { -+ return envList("CXX", defaultCXX) -+} -+ - // gfortranCmd returns a gfortran command line prefix. - func (b *builder) gfortranCmd(objdir string) []string { - return b.ccompilerCmd("FC", "gfortran", objdir) -Index: go/src/cmd/go/env.go -=================================================================== ---- go.orig/src/cmd/go/env.go -+++ go/src/cmd/go/env.go -@@ -51,10 +51,9 @@ func mkEnv() []envVar { - - if goos != "plan9" { - cmd := b.gccCmd(".") -- env = append(env, envVar{"CC", cmd[0]}) -+ env = append(env, envVar{"CC", strings.Join(b.gccCmdForReal(), " ")}) - env = append(env, envVar{"GOGCCFLAGS", strings.Join(cmd[3:], " ")}) -- cmd = b.gxxCmd(".") -- env = append(env, envVar{"CXX", cmd[0]}) -+ env = append(env, envVar{"CXX", strings.Join(b.gxxCmdForReal(), " ")}) - } - - if buildContext.CgoEnabled { -- cgit v1.2.3-54-g00ecf