diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-11-21 00:23:16 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-24 10:27:45 +0000 |
commit | 0917e35aa2813e843457302d1a370dd6c7b03ad6 (patch) | |
tree | aff48f19272781a2976ad85854e7588fa680d732 /meta/recipes-devtools/go | |
parent | 28087bb1197c01e9fa976eaa3c6a24b499af701e (diff) | |
download | poky-0917e35aa2813e843457302d1a370dd6c7b03ad6.tar.gz |
go: Update to 1.15.5
Define CXX_FOR_TARGET and CC_FOR_TARGET for target go
since we are cross building it, it helps in defining the compiler
for cgo on target
backport a patch to fix CGO_LDFLAGS regression like below
Fixes
| Building std for target, linux/arm.
| go build runtime/cgo: invalid flag in go:cgo_ldflag: -Wl,-O1
(From OE-Core rev: a71d1b58e8cf0976a614c49aa2dfe1e0605dfe95)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go')
-rw-r--r-- | meta/recipes-devtools/go/go-1.15.inc | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch | 100 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-binary-native_1.15.5.bb (renamed from meta/recipes-devtools/go/go-binary-native_1.15.3.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go_1.15.bb | 2 |
4 files changed, 107 insertions, 4 deletions
diff --git a/meta/recipes-devtools/go/go-1.15.inc b/meta/recipes-devtools/go/go-1.15.inc index a35921c1f8..ccfb0c5987 100644 --- a/meta/recipes-devtools/go/go-1.15.inc +++ b/meta/recipes-devtools/go/go-1.15.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | require go-common.inc | 1 | require go-common.inc |
2 | 2 | ||
3 | GO_BASEVERSION = "1.15" | 3 | GO_BASEVERSION = "1.15" |
4 | PV = "1.15.3" | 4 | PV = "1.15.5" |
5 | FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" | 5 | FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" |
@@ -15,5 +15,6 @@ SRC_URI += "\ | |||
15 | file://0006-cmd-dist-separate-host-and-target-builds.patch \ | 15 | file://0006-cmd-dist-separate-host-and-target-builds.patch \ |
16 | file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ | 16 | file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ |
17 | file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ | 17 | file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ |
18 | file://0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch \ | ||
18 | " | 19 | " |
19 | SRC_URI[main.sha256sum] = "896a602570e54c8cdfc2c1348abd4ffd1016758d0bd086ccd9787dbfc9b64888" | 20 | SRC_URI[main.sha256sum] = "c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1" |
diff --git a/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch b/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch new file mode 100644 index 0000000000..b57041f1db --- /dev/null +++ b/meta/recipes-devtools/go/go-1.15/0009-cmd-go-permit-CGO_LDFLAGS-to-appear-in-go-ldflag.patch | |||
@@ -0,0 +1,100 @@ | |||
1 | From 4759221d46b1666de96b8047cec3160bfe4d3d5d Mon Sep 17 00:00:00 2001 | ||
2 | From: Ian Lance Taylor <iant@golang.org> | ||
3 | Date: Fri, 13 Nov 2020 11:05:37 -0800 | ||
4 | Subject: [PATCH] cmd/go: permit CGO_LDFLAGS to appear in //go:ldflag | ||
5 | |||
6 | Fixes #42565 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/golang/go/commit/782cf560db4c919790fdb476d1bbe18e5ddf5ffd] | ||
9 | Change-Id: If7cf39905d124dbd54dfac6a53ee38270498efed | ||
10 | Reviewed-on: https://go-review.googlesource.com/c/go/+/269818 | ||
11 | Trust: Ian Lance Taylor <iant@golang.org> | ||
12 | Run-TryBot: Ian Lance Taylor <iant@golang.org> | ||
13 | TryBot-Result: Go Bot <gobot@golang.org> | ||
14 | Reviewed-by: Jay Conrod <jayconrod@google.com> | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | src/cmd/go/internal/work/exec.go | 15 +++++++++ | ||
18 | src/cmd/go/testdata/script/ldflag.txt | 44 +++++++++++++++++++++++++++ | ||
19 | 2 files changed, 59 insertions(+) | ||
20 | create mode 100644 src/cmd/go/testdata/script/ldflag.txt | ||
21 | |||
22 | diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go | ||
23 | index 575a2df..9209e3d 100644 | ||
24 | --- a/src/cmd/go/internal/work/exec.go | ||
25 | +++ b/src/cmd/go/internal/work/exec.go | ||
26 | @@ -2821,6 +2821,21 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo | ||
27 | idx = bytes.Index(src, []byte(cgoLdflag)) | ||
28 | } | ||
29 | } | ||
30 | + | ||
31 | + // We expect to find the contents of cgoLDFLAGS in flags. | ||
32 | + if len(cgoLDFLAGS) > 0 { | ||
33 | + outer: | ||
34 | + for i := range flags { | ||
35 | + for j, f := range cgoLDFLAGS { | ||
36 | + if f != flags[i+j] { | ||
37 | + continue outer | ||
38 | + } | ||
39 | + } | ||
40 | + flags = append(flags[:i], flags[i+len(cgoLDFLAGS):]...) | ||
41 | + break | ||
42 | + } | ||
43 | + } | ||
44 | + | ||
45 | if err := checkLinkerFlags("LDFLAGS", "go:cgo_ldflag", flags); err != nil { | ||
46 | return nil, nil, err | ||
47 | } | ||
48 | diff --git a/src/cmd/go/testdata/script/ldflag.txt b/src/cmd/go/testdata/script/ldflag.txt | ||
49 | new file mode 100644 | ||
50 | index 0000000..6ceb33b | ||
51 | --- /dev/null | ||
52 | +++ b/src/cmd/go/testdata/script/ldflag.txt | ||
53 | @@ -0,0 +1,44 @@ | ||
54 | +# Issue #42565 | ||
55 | + | ||
56 | +[!cgo] skip | ||
57 | + | ||
58 | +# We can't build package bad, which uses #cgo LDFLAGS. | ||
59 | +cd bad | ||
60 | +! go build | ||
61 | +stderr no-such-warning | ||
62 | + | ||
63 | +# We can build package ok with the same flags in CGO_LDFLAGS. | ||
64 | +env CGO_LDFLAGS=-Wno-such-warning -Wno-unknown-warning-option | ||
65 | +cd ../ok | ||
66 | +go build | ||
67 | + | ||
68 | +# Build a main program that actually uses LDFLAGS. | ||
69 | +cd .. | ||
70 | +go build -ldflags=-v | ||
71 | + | ||
72 | +# Because we passed -v the Go linker should print the external linker | ||
73 | +# command which should include the flag we passed in CGO_LDFLAGS. | ||
74 | +stderr no-such-warning | ||
75 | + | ||
76 | +-- go.mod -- | ||
77 | +module ldflag | ||
78 | + | ||
79 | +-- bad/bad.go -- | ||
80 | +package bad | ||
81 | + | ||
82 | +// #cgo LDFLAGS: -Wno-such-warning -Wno-unknown-warning | ||
83 | +import "C" | ||
84 | + | ||
85 | +func F() {} | ||
86 | +-- ok/ok.go -- | ||
87 | +package ok | ||
88 | + | ||
89 | +import "C" | ||
90 | + | ||
91 | +func F() {} | ||
92 | +-- main.go -- | ||
93 | +package main | ||
94 | + | ||
95 | +import _ "ldflag/ok" | ||
96 | + | ||
97 | +func main() {} | ||
98 | -- | ||
99 | 2.29.2 | ||
100 | |||
diff --git a/meta/recipes-devtools/go/go-binary-native_1.15.3.bb b/meta/recipes-devtools/go/go-binary-native_1.15.5.bb index aeab91a80f..1fb11b0435 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.15.3.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.15.5.bb | |||
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" | |||
8 | PROVIDES = "go-native" | 8 | PROVIDES = "go-native" |
9 | 9 | ||
10 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" | 10 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" |
11 | SRC_URI[go_linux_amd64.sha256sum] = "010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d" | 11 | SRC_URI[go_linux_amd64.sha256sum] = "9a58494e8da722c3aef248c9227b0e9c528c7318309827780f16220998180a0d" |
12 | SRC_URI[go_linux_arm64.sha256sum] = "b8b88a87ada918ef5189fa5938ef4c46a4f61952a34317612aaac705f4275f80" | 12 | SRC_URI[go_linux_arm64.sha256sum] = "a72a0b036beb4193a0214bca3fca4c5d68a38a4ccf098c909f7ce8bf08567c48" |
13 | 13 | ||
14 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" | 14 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" |
15 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" | 15 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" |
diff --git a/meta/recipes-devtools/go/go_1.15.bb b/meta/recipes-devtools/go/go_1.15.bb index cc4c3fe45d..d4812c0f0a 100644 --- a/meta/recipes-devtools/go/go_1.15.bb +++ b/meta/recipes-devtools/go/go_1.15.bb | |||
@@ -6,6 +6,8 @@ inherit linuxloader | |||
6 | export GOBUILDMODE="" | 6 | export GOBUILDMODE="" |
7 | export CGO_ENABLED_riscv64 = "" | 7 | export CGO_ENABLED_riscv64 = "" |
8 | export GO_LDSO = "${@get_linuxloader(d)}" | 8 | export GO_LDSO = "${@get_linuxloader(d)}" |
9 | export CC_FOR_TARGET = "gcc" | ||
10 | export CXX_FOR_TARGET = "g++" | ||
9 | 11 | ||
10 | # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv and its | 12 | # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv and its |
11 | # variants. | 13 | # variants. |