diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-31 16:56:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-01 17:34:59 +0000 |
commit | f5320f05bd06a82b152751eba8dedb4e720daec7 (patch) | |
tree | 4447a95c5430e829cbdf80fc1b06608a8ba63ef4 /meta/recipes-devtools/go/go | |
parent | 11ad2553f3fc7cd20e7219fd5000e388621e7a91 (diff) | |
download | poky-f5320f05bd06a82b152751eba8dedb4e720daec7.tar.gz |
go: update 1.19 -> 1.19.2
Drop stack-protector.patch as issue fixed upstream.
(From OE-Core rev: 1b79d63a0703deb341f7693bd7b7c080a553b876)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go/go')
-rw-r--r-- | meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go/stack-protector.patch | 32 |
2 files changed, 4 insertions, 36 deletions
diff --git a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch index 8cbed93017..17fa9d9831 100644 --- a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a3db4da51df37d163ff9e8c1e1057280c648c545 Mon Sep 17 00:00:00 2001 | 1 | From fb22e586871cc6be0b7041e86d2daceee06ea568 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 28 Mar 2022 10:59:03 -0700 | 3 | Date: Mon, 28 Mar 2022 10:59:03 -0700 |
4 | Subject: [PATCH] cmd/go: make content-based hash generation less pedantic | 4 | Subject: [PATCH] cmd/go: make content-based hash generation less pedantic |
@@ -32,13 +32,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
32 | 2 files changed, 34 insertions(+), 10 deletions(-) | 32 | 2 files changed, 34 insertions(+), 10 deletions(-) |
33 | 33 | ||
34 | diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go | 34 | diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go |
35 | index 529351d..df791b0 100644 | 35 | index 81ee859..2db3898 100644 |
36 | --- a/src/cmd/go/internal/envcmd/env.go | 36 | --- a/src/cmd/go/internal/envcmd/env.go |
37 | +++ b/src/cmd/go/internal/envcmd/env.go | 37 | +++ b/src/cmd/go/internal/envcmd/env.go |
38 | @@ -176,7 +176,7 @@ func ExtraEnvVars() []cfg.EnvVar { | 38 | @@ -176,7 +176,7 @@ func ExtraEnvVars() []cfg.EnvVar { |
39 | func ExtraEnvVarsCostly() []cfg.EnvVar { | 39 | func ExtraEnvVarsCostly() []cfg.EnvVar { |
40 | var b work.Builder | 40 | b := work.NewBuilder("") |
41 | b.Init() | 41 | |
42 | - cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}) | 42 | - cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}) |
43 | + cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false) | 43 | + cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false) |
44 | if err != nil { | 44 | if err != nil { |
diff --git a/meta/recipes-devtools/go/go/stack-protector.patch b/meta/recipes-devtools/go/go/stack-protector.patch deleted file mode 100644 index cc92a444a7..0000000000 --- a/meta/recipes-devtools/go/go/stack-protector.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From c537b87782293fe222f2ef5eb1ae818092118e97 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ian Lance Taylor <iant@golang.org> | ||
3 | Date: Sun, 07 Aug 2022 19:21:15 -0700 | ||
4 | Subject: [PATCH] runtime/cgo: add -fno-stack-protector to CFLAGS | ||
5 | |||
6 | Some compilers default to having -fstack-protector on, which breaks | ||
7 | when using internal linking because the linker doesn't know how to | ||
8 | find the support functions. | ||
9 | |||
10 | Fixes #52919 | ||
11 | Fixes #54313 | ||
12 | |||
13 | Change-Id: I6f51d5e906503f61fc768ad8e30c163bad135087 | ||
14 | Upstream-Status: Submitted [https://github.com/golang/go/issues/54313] | ||
15 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
16 | --- | ||
17 | |||
18 | diff --git a/src/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go | ||
19 | index 298aa63..4b7046e 100644 | ||
20 | --- a/src/runtime/cgo/cgo.go | ||
21 | +++ b/src/runtime/cgo/cgo.go | ||
22 | @@ -23,7 +23,9 @@ | ||
23 | #cgo solaris LDFLAGS: -lxnet | ||
24 | #cgo solaris LDFLAGS: -lsocket | ||
25 | |||
26 | -#cgo CFLAGS: -Wall -Werror | ||
27 | +// We use -fno-stack-protector because internal linking won't find | ||
28 | +// the support functions. See issues #52919 and #54313. | ||
29 | +#cgo CFLAGS: -Wall -Werror -fno-stack-protector | ||
30 | |||
31 | #cgo solaris CPPFLAGS: -D_POSIX_PTHREAD_SEMANTICS | ||
32 | |||