go: Upgrade compiler to 1.16 major release
PATCH 1/1 go: Upgrade compiler to 1.16 major release
Revert a CC/CXX check [1] which wont work with OE settings Forward port needed patches forward
Details releaase notes are here [2]
[1] https://go-review.googlesource.com/c/go/+/228517/
[2] https://golang.org/doc/go1.16
Signed-off-by Khem Raj <[email protected]>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../go/{go-1.15.inc => go-1.16.inc} | 7 +-
...ow-CC-and-CXX-to-have-multiple-words.patch | 0
...ent-based-hash-generation-less-pedan.patch | 22 ++---
...-to-be-overridden-in-the-environment.patch | 0
...4-ld-add-soname-to-shareable-objects.patch | 18 +---
...de-CC-when-building-dist-and-go_boot.patch | 0
...dist-separate-host-and-target-builds.patch | 0
...d-go-make-GOROOT-precious-by-default.patch | 0
...008-use-GOBUILDMODE-to-set-buildmode.patch | 0
...go-make-sure-CC-and-CXX-are-absolute.patch | 95 +++++++++++++++++++
...ive_1.15.8.bb => go-binary-native_1.16.bb} | 4 +-
...dian_1.15.bb => go-cross-canadian_1.16.bb} | 0
.../go/{go-cross_1.15.bb => go-cross_1.16.bb} | 0
...o-crosssdk_1.15.bb => go-crosssdk_1.16.bb} | 0
.../{go-native_1.15.bb => go-native_1.16.bb} | 0
...{go-runtime_1.15.bb => go-runtime_1.16.bb} | 0
.../go/{go_1.15.bb => go_1.16.bb} | 0
18 files changed, 118 insertions(+), 30 deletions(-)
rename meta/recipes-devtools/go/{go-1.15.inc => go-1.16.inc} (78%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (100%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (93%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (100%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0004-ld-add-soname-to-shareable-objects.patch (63%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (100%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0006-cmd-dist-separate-host-and-target-builds.patch (100%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0007-cmd-go-make-GOROOT-precious-by-default.patch (100%)
rename meta/recipes-devtools/go/{go-1.15 => go-1.16}/0008-use-GOBUILDMODE-to-set-buildmode.patch (100%)
create mode 100644 meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch
rename meta/recipes-devtools/go/{go-binary-native_1.15.8.bb => go-binary-native_1.16.bb} (83%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.15.bb => go-cross-canadian_1.16.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.15.bb => go-cross_1.16.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.15.bb => go-crosssdk_1.16.bb} (100%)
rename meta/recipes-devtools/go/{go-native_1.15.bb => go-native_1.16.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.15.bb => go-runtime_1.16.bb} (100%)
rename meta/recipes-devtools/go/{go_1.15.bb => go_1.16.bb} (100%)meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -23,7 +23,7 @@ GDBVERSION ?= "10.%" GLIBCVERSION ?= "2.33" LINUXLIBCVERSION ?= "5.10%" QEMUVERSION ?= "5.2%" -GOVERSION ?= "1.15%" +GOVERSION ?= "1.16%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "10.0.1"
meta/recipes-devtools/go/go-1.16.inc renamed from meta/recipes-devtools/go/go-1.15.inc +4 -3
@@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.15" -PV = "1.15.8" +GO_BASEVERSION = "1.16" +PV = "1.16" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
@@ -15,5 +15,6 @@ SRC_URI += "\ file://0006-cmd-dist-separate-host-and-target-builds.patch \ file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ + file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \ " -SRC_URI[main.sha256sum] = "540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2" +SRC_URI[main.sha256sum] = "7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a"
meta/recipes-devtools/go/go-1.16/0001-allow-CC-and-CXX-to-have-multiple-words.patch renamed from meta/recipes-devtools/go/go-1.15/0001-allow-CC-and-CXX-to-have-multiple-words.patch +0 -0
meta/recipes-devtools/go/go-1.16/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch renamed from meta/recipes-devtools/go/go-1.15/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch +11 -11
@@ -63,8 +63,8 @@ Signed-off-by: Alexander J Kube <[email protected]> fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err) --- a/src/cmd/go/internal/work/exec.go +++ b/src/cmd/go/internal/work/exec.go -@@ -33,6 +33,8 @@ import ( - "cmd/go/internal/str" +@@ -37,6 +37,8 @@ import ( + "cmd/go/internal/trace" ) +var omitGopath = os.Getenv("GOPATH_OMIT_IN_ACTIONID") != ""
@@ -72,7 +72,7 @@ Signed-off-by: Alexander J Kube <[email protected]> // actionList returns the list of actions in the dag rooted at root // as visited in a depth-first post-order traversal. func actionList(root *Action) []*Action { -@@ -209,7 +211,7 @@ func (b *Builder) buildActionID(a *Actio +@@ -228,7 +230,7 @@ func (b *Builder) buildActionID(a *Actio // Assume b.WorkDir is being trimmed properly. // When -trimpath is used with a package built from the module cache, // use the module path and version instead of the directory.
@@ -81,7 +81,7 @@ Signed-off-by: Alexander J Kube <[email protected]> fmt.Fprintf(h, "dir %s\n", p.Dir) } else if cfg.BuildTrimpath && p.Module != nil { fmt.Fprintf(h, "module %s@%s\n", p.Module.Path, p.Module.Version) -@@ -228,13 +230,13 @@ func (b *Builder) buildActionID(a *Actio +@@ -247,13 +249,13 @@ func (b *Builder) buildActionID(a *Actio } if len(p.CgoFiles)+len(p.SwigFiles) > 0 { fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo"))
@@ -99,7 +99,7 @@ Signed-off-by: Alexander J Kube <[email protected]> } // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions? } -@@ -2298,33 +2300,48 @@ var ( +@@ -2401,33 +2403,48 @@ var ( // gccCmd returns a gcc command line prefix // defaultCC is defined in zdefaultcc.go, written by cmd/dist. func (b *Builder) GccCmd(incdir, workdir string) []string {
@@ -157,7 +157,7 @@ Signed-off-by: Alexander J Kube <[email protected]> } // compilerExe returns the compiler to use given an -@@ -2333,11 +2350,16 @@ func (b *Builder) fcExe() []string { +@@ -2436,11 +2453,16 @@ func (b *Builder) fcExe() []string { // of the compiler but can have additional arguments if they // were present in the environment value. // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"].
@@ -165,7 +165,7 @@ Signed-off-by: Alexander J Kube <[email protected]> +func (b *Builder) compilerExe(envValue string, def string, filtered bool) []string { compiler := strings.Fields(envValue) if len(compiler) == 0 { - compiler = []string{def} + compiler = strings.Fields(def) } + + if filtered {
@@ -175,7 +175,7 @@ Signed-off-by: Alexander J Kube <[email protected]> return compiler } -@@ -2510,7 +2532,7 @@ func envList(key, def string) []string { +@@ -2620,7 +2642,7 @@ func envList(key, def string) []string { } // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo.
@@ -184,7 +184,7 @@ Signed-off-by: Alexander J Kube <[email protected]> defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2529,6 +2551,14 @@ func (b *Builder) CFlags(p *load.Package +@@ -2639,6 +2661,14 @@ func (b *Builder) CFlags(p *load.Package return }
@@ -199,7 +199,7 @@ Signed-off-by: Alexander J Kube <[email protected]> return } -@@ -2543,7 +2573,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2653,7 +2683,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package
@@ -208,7 +208,7 @@ Signed-off-by: Alexander J Kube <[email protected]> if err != nil { return nil, nil, err } -@@ -2902,7 +2932,7 @@ func (b *Builder) swigIntSize(objdir str +@@ -3104,7 +3134,7 @@ func (b *Builder) swigIntSize(objdir str // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) {
meta/recipes-devtools/go/go-1.16/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch renamed from meta/recipes-devtools/go/go-1.15/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch +0 -0
meta/recipes-devtools/go/go-1.16/0004-ld-add-soname-to-shareable-objects.patch renamed from meta/recipes-devtools/go/go-1.15/0004-ld-add-soname-to-shareable-objects.patch +5 -13
@@ -19,23 +19,15 @@ Signed-off-by: Alexander J Kube <[email protected]> --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go -@@ -1446,6 +1446,7 @@ func (ctxt *Link) hostlink() { +@@ -1343,6 +1343,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared") + argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile))) - if ctxt.HeadType != objabi.Hwindows { - // Pass -z nodelete to mark the shared library as - // non-closeable: a dlclose will do nothing. -@@ -1457,6 +1458,7 @@ func (ctxt *Link) hostlink() { - argv = append(argv, "-Wl,-z,relro") - } - argv = append(argv, "-shared") -+ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile))) - case BuildModePlugin: - if ctxt.HeadType == objabi.Hdarwin { - argv = append(argv, "-dynamiclib") -@@ -1465,6 +1467,7 @@ func (ctxt *Link) hostlink() { + if ctxt.HeadType == objabi.Hwindows { + if *flagAslr { + argv = addASLRargs(argv) +@@ -1366,6 +1367,7 @@ func (ctxt *Link) hostlink() { argv = append(argv, "-Wl,-z,relro") } argv = append(argv, "-shared")
meta/recipes-devtools/go/go-1.16/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch renamed from meta/recipes-devtools/go/go-1.15/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch +0 -0
meta/recipes-devtools/go/go-1.16/0006-cmd-dist-separate-host-and-target-builds.patch renamed from meta/recipes-devtools/go/go-1.15/0006-cmd-dist-separate-host-and-target-builds.patch +0 -0
meta/recipes-devtools/go/go-1.16/0007-cmd-go-make-GOROOT-precious-by-default.patch renamed from meta/recipes-devtools/go/go-1.15/0007-cmd-go-make-GOROOT-precious-by-default.patch +0 -0
meta/recipes-devtools/go/go-1.16/0008-use-GOBUILDMODE-to-set-buildmode.patch renamed from meta/recipes-devtools/go/go-1.15/0008-use-GOBUILDMODE-to-set-buildmode.patch +0 -0
meta/recipes-devtools/go/go-1.16/0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch new file +95 -0
95 lines not on this page · raw message
meta/recipes-devtools/go/go-binary-native_1.16.bb renamed from meta/recipes-devtools/go/go-binary-native_1.15.8.bb +2 -2
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" PROVIDES = "go-native" SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b" -SRC_URI[go_linux_arm64.sha256sum] = "0e31ea4bf53496b0f0809730520dee98c0ae5c530f3701a19df0ba0a327bf3d2" +SRC_URI[go_linux_amd64.sha256sum] = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2" +SRC_URI[go_linux_arm64.sha256sum] = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.16.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.15.bb +0 -0
meta/recipes-devtools/go/go-cross_1.16.bb renamed from meta/recipes-devtools/go/go-cross_1.15.bb +0 -0
meta/recipes-devtools/go/go-crosssdk_1.16.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.15.bb +0 -0
meta/recipes-devtools/go/go-native_1.16.bb renamed from meta/recipes-devtools/go/go-native_1.15.bb +0 -0
meta/recipes-devtools/go/go-runtime_1.16.bb renamed from meta/recipes-devtools/go/go-runtime_1.15.bb +0 -0
meta/recipes-devtools/go/go_1.16.bb renamed from meta/recipes-devtools/go/go_1.15.bb +0 -0
Signature · 1 line
2.30.1