summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-10-31 16:56:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-01 17:34:59 +0000
commitf5320f05bd06a82b152751eba8dedb4e720daec7 (patch)
tree4447a95c5430e829cbdf80fc1b06608a8ba63ef4 /meta/recipes-devtools
parent11ad2553f3fc7cd20e7219fd5000e388621e7a91 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/go/go-1.19.2.inc (renamed from meta/recipes-devtools/go/go-1.19.inc)3
-rw-r--r--meta/recipes-devtools/go/go-binary-native_1.19.2.bb (renamed from meta/recipes-devtools/go/go-binary-native_1.19.bb)7
-rw-r--r--meta/recipes-devtools/go/go-cross-canadian_1.19.2.bb (renamed from meta/recipes-devtools/go/go-cross-canadian_1.19.bb)0
-rw-r--r--meta/recipes-devtools/go/go-cross_1.19.2.bb (renamed from meta/recipes-devtools/go/go-cross_1.19.bb)0
-rw-r--r--meta/recipes-devtools/go/go-crosssdk_1.19.2.bb (renamed from meta/recipes-devtools/go/go-crosssdk_1.19.bb)0
-rw-r--r--meta/recipes-devtools/go/go-native_1.19.2.bb (renamed from meta/recipes-devtools/go/go-native_1.19.bb)0
-rw-r--r--meta/recipes-devtools/go/go-runtime_1.19.2.bb (renamed from meta/recipes-devtools/go/go-runtime_1.19.bb)0
-rw-r--r--meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch8
-rw-r--r--meta/recipes-devtools/go/go/stack-protector.patch32
-rw-r--r--meta/recipes-devtools/go/go_1.19.2.bb (renamed from meta/recipes-devtools/go/go_1.19.bb)0
10 files changed, 9 insertions, 41 deletions
diff --git a/meta/recipes-devtools/go/go-1.19.inc b/meta/recipes-devtools/go/go-1.19.2.inc
index f733a807b4..206ee3ca45 100644
--- a/meta/recipes-devtools/go/go-1.19.inc
+++ b/meta/recipes-devtools/go/go-1.19.2.inc
@@ -14,6 +14,5 @@ SRC_URI += "\
14 file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \ 14 file://0001-exec.go-do-not-write-linker-flags-into-buildids.patch \
15 file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ 15 file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
16 file://filter-build-paths.patch \ 16 file://filter-build-paths.patch \
17 file://stack-protector.patch \
18" 17"
19SRC_URI[main.sha256sum] = "9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9" 18SRC_URI[main.sha256sum] = "2ce930d70a931de660fdaf271d70192793b1b240272645bf0275779f6704df6b"
diff --git a/meta/recipes-devtools/go/go-binary-native_1.19.bb b/meta/recipes-devtools/go/go-binary-native_1.19.2.bb
index eda90f3753..65d7c9de49 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.19.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.19.2.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
7 7
8PROVIDES = "go-native" 8PROVIDES = "go-native"
9 9
10# Checksums available at https://go.dev/dl/
10SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" 11SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
11SRC_URI[go_linux_amd64.sha256sum] = "464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6" 12SRC_URI[go_linux_amd64.sha256sum] = "5e8c5a74fe6470dd7e055a461acda8bb4050ead8c2df70f227e3ff7d8eb7eeb6"
12SRC_URI[go_linux_arm64.sha256sum] = "efa97fac9574fc6ef6c9ff3e3758fb85f1439b046573bf434cccb5e012bd00c8" 13SRC_URI[go_linux_arm64.sha256sum] = "b62a8d9654436c67c14a0c91e931d50440541f09eb991a987536cb982903126d"
13SRC_URI[go_linux_ppc64le.sha256sum] = "92bf5aa598a01b279d03847c32788a3a7e0a247a029dedb7c759811c2a4241fc" 14SRC_URI[go_linux_ppc64le.sha256sum] = "37e1d4342f7103aeb9babeabe8c71ef3dba23db28db525071119e94b2aa21d7d"
14 15
15UPSTREAM_CHECK_URI = "https://golang.org/dl/" 16UPSTREAM_CHECK_URI = "https://golang.org/dl/"
16UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" 17UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.19.bb b/meta/recipes-devtools/go/go-cross-canadian_1.19.2.bb
index 7ac9449e47..7ac9449e47 100644
--- a/meta/recipes-devtools/go/go-cross-canadian_1.19.bb
+++ b/meta/recipes-devtools/go/go-cross-canadian_1.19.2.bb
diff --git a/meta/recipes-devtools/go/go-cross_1.19.bb b/meta/recipes-devtools/go/go-cross_1.19.2.bb
index 80b5a03f6c..80b5a03f6c 100644
--- a/meta/recipes-devtools/go/go-cross_1.19.bb
+++ b/meta/recipes-devtools/go/go-cross_1.19.2.bb
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.19.bb b/meta/recipes-devtools/go/go-crosssdk_1.19.2.bb
index 1857c8a577..1857c8a577 100644
--- a/meta/recipes-devtools/go/go-crosssdk_1.19.bb
+++ b/meta/recipes-devtools/go/go-crosssdk_1.19.2.bb
diff --git a/meta/recipes-devtools/go/go-native_1.19.bb b/meta/recipes-devtools/go/go-native_1.19.2.bb
index ddf25b2c9b..ddf25b2c9b 100644
--- a/meta/recipes-devtools/go/go-native_1.19.bb
+++ b/meta/recipes-devtools/go/go-native_1.19.2.bb
diff --git a/meta/recipes-devtools/go/go-runtime_1.19.bb b/meta/recipes-devtools/go/go-runtime_1.19.2.bb
index 63464a1501..63464a1501 100644
--- a/meta/recipes-devtools/go/go-runtime_1.19.bb
+++ b/meta/recipes-devtools/go/go-runtime_1.19.2.bb
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 @@
1From a3db4da51df37d163ff9e8c1e1057280c648c545 Mon Sep 17 00:00:00 2001 1From fb22e586871cc6be0b7041e86d2daceee06ea568 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 28 Mar 2022 10:59:03 -0700 3Date: Mon, 28 Mar 2022 10:59:03 -0700
4Subject: [PATCH] cmd/go: make content-based hash generation less pedantic 4Subject: [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
34diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go 34diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
35index 529351d..df791b0 100644 35index 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 @@
1From c537b87782293fe222f2ef5eb1ae818092118e97 Mon Sep 17 00:00:00 2001
2From: Ian Lance Taylor <iant@golang.org>
3Date: Sun, 07 Aug 2022 19:21:15 -0700
4Subject: [PATCH] runtime/cgo: add -fno-stack-protector to CFLAGS
5
6Some compilers default to having -fstack-protector on, which breaks
7when using internal linking because the linker doesn't know how to
8find the support functions.
9
10Fixes #52919
11Fixes #54313
12
13Change-Id: I6f51d5e906503f61fc768ad8e30c163bad135087
14Upstream-Status: Submitted [https://github.com/golang/go/issues/54313]
15Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16---
17
18diff --git a/src/runtime/cgo/cgo.go b/src/runtime/cgo/cgo.go
19index 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
diff --git a/meta/recipes-devtools/go/go_1.19.bb b/meta/recipes-devtools/go/go_1.19.2.bb
index 98977673ee..98977673ee 100644
--- a/meta/recipes-devtools/go/go_1.19.bb
+++ b/meta/recipes-devtools/go/go_1.19.2.bb