<div dir="ltr">This patch worked fine until a `bitbake -c cleanall`. I'm investigating the root cause right now; please do not merge.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Oct 25, 2019 at 6:29 PM Alexander Kube <<a href="mailto:alexander.j.kube@gmail.com">alexander.j.kube@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
<br>
Signed-off-by: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
---<br>
meta/recipes-devtools/go/go-1.12.inc | 24 --<br>
...ow-CC-and-CXX-to-have-multiple-words.patch | 31 --<br>
...o1.12-security-net-textproto-don-t-n.patch | 163 ----------<br>
...ent-based-hash-generation-less-pedan.patch | 218 --------------<br>
...-to-be-overridden-in-the-environment.patch | 48 ---<br>
...4-ld-add-soname-to-shareable-objects.patch | 45 ---<br>
...de-CC-when-building-dist-and-go_boot.patch | 37 ---<br>
...dist-separate-host-and-target-builds.patch | 282 ------------------<br>
...d-go-make-GOROOT-precious-by-default.patch | 106 -------<br>
...008-use-GOBUILDMODE-to-set-buildmode.patch | 37 ---<br>
...place-glibc-dynamic-linker-with-musl.patch | 112 -------<br>
.../go/<a href="http://go-cross-canadian_1.12.bb" rel="noreferrer" target="_blank">go-cross-canadian_1.12.bb</a> | 2 -<br>
meta/recipes-devtools/go/<a href="http://go-cross_1.12.bb" rel="noreferrer" target="_blank">go-cross_1.12.bb</a> | 2 -<br>
meta/recipes-devtools/go/<a href="http://go-crosssdk_1.12.bb" rel="noreferrer" target="_blank">go-crosssdk_1.12.bb</a> | 2 -<br>
meta/recipes-devtools/go/<a href="http://go-native_1.12.bb" rel="noreferrer" target="_blank">go-native_1.12.bb</a> | 2 -<br>
meta/recipes-devtools/go/<a href="http://go-runtime_1.12.bb" rel="noreferrer" target="_blank">go-runtime_1.12.bb</a> | 2 -<br>
meta/recipes-devtools/go/<a href="http://go_1.12.bb" rel="noreferrer" target="_blank">go_1.12.bb</a> | 14 -<br>
17 files changed, 1127 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12.inc<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0001-allow-CC-and-CXX-to-have-multiple-words.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0001-release-branch.go1.12-security-net-textproto-don-t-n.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0004-ld-add-soname-to-shareable-objects.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0006-cmd-dist-separate-host-and-target-builds.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0007-cmd-go-make-GOROOT-precious-by-default.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.12/0009-ld-replace-glibc-dynamic-linker-with-musl.patch<br>
delete mode 100644 meta/recipes-devtools/go/<a href="http://go-cross-canadian_1.12.bb" rel="noreferrer" target="_blank">go-cross-canadian_1.12.bb</a><br>
delete mode 100644 meta/recipes-devtools/go/<a href="http://go-cross_1.12.bb" rel="noreferrer" target="_blank">go-cross_1.12.bb</a><br>
delete mode 100644 meta/recipes-devtools/go/<a href="http://go-crosssdk_1.12.bb" rel="noreferrer" target="_blank">go-crosssdk_1.12.bb</a><br>
delete mode 100644 meta/recipes-devtools/go/<a href="http://go-native_1.12.bb" rel="noreferrer" target="_blank">go-native_1.12.bb</a><br>
delete mode 100644 meta/recipes-devtools/go/<a href="http://go-runtime_1.12.bb" rel="noreferrer" target="_blank">go-runtime_1.12.bb</a><br>
delete mode 100644 meta/recipes-devtools/go/<a href="http://go_1.12.bb" rel="noreferrer" target="_blank">go_1.12.bb</a><br>
<br>
diff --git a/meta/recipes-devtools/go/go-1.12.inc b/meta/recipes-devtools/go/go-1.12.inc<br>
deleted file mode 100644<br>
index ed14b175e6..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12.inc<br>
+++ /dev/null<br>
@@ -1,24 +0,0 @@<br>
-require go-common.inc<br>
-<br>
-GO_BASEVERSION = "1.12"<br>
-GO_MINOR = ".9"<br>
-PV .= "${GO_MINOR}"<br>
-FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"<br>
-<br>
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"<br>
-<br>
-SRC_URI += "\<br>
- file://0001-allow-CC-and-CXX-to-have-multiple-words.patch \<br>
- file://0002-cmd-go-make-content-based-hash-generation-less-pedan.patch \<br>
- file://0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch \<br>
- file://0004-ld-add-soname-to-shareable-objects.patch \<br>
- file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \<br>
- file://0006-cmd-dist-separate-host-and-target-builds.patch \<br>
- file://0007-cmd-go-make-GOROOT-precious-by-default.patch \<br>
- file://0008-use-GOBUILDMODE-to-set-buildmode.patch \<br>
- file://0001-release-branch.go1.12-security-net-textproto-don-t-n.patch \<br>
-"<br>
-SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"<br>
-<br>
-SRC_URI[main.md5sum] = "6132109d4050da349eadc9f7b0304ef4"<br>
-SRC_URI[main.sha256sum] = "ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc"<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.12/0001-allow-CC-and-CXX-to-have-multiple-words.patch<br>
deleted file mode 100644<br>
index 4442858c83..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0001-allow-CC-and-CXX-to-have-multiple-words.patch<br>
+++ /dev/null<br>
@@ -1,31 +0,0 @@<br>
-From 7cc519aa5f84cf8fc7ac8c10fc69aa8040330ea0 Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Mon, 19 Feb 2018 08:49:33 -0800<br>
-Subject: [PATCH] allow CC and CXX to have multiple words<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
----<br>
- src/cmd/go/internal/envcmd/env.go | 4 ++--<br>
- 1 file changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go<br>
-index afadbad..cedbfbf 100644<br>
---- a/src/cmd/go/internal/envcmd/env.go<br>
-+++ b/src/cmd/go/internal/envcmd/env.go<br>
-@@ -85,11 +85,11 @@ func MkEnv() []cfg.EnvVar {<br>
- <br>
- cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch)<br>
- if env := strings.Fields(os.Getenv("CC")); len(env) > 0 {<br>
-- cc = env[0]<br>
-+ cc = strings.Join(env, " ")<br>
- }<br>
- cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch)<br>
- if env := strings.Fields(os.Getenv("CXX")); len(env) > 0 {<br>
-- cxx = env[0]<br>
-+ cxx = strings.Join(env, " ")<br>
- }<br>
- env = append(env, cfg.EnvVar{Name: "CC", Value: cc})<br>
- env = append(env, cfg.EnvVar{Name: "CXX", Value: cxx})<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0001-release-branch.go1.12-security-net-textproto-don-t-n.patch b/meta/recipes-devtools/go/go-1.12/0001-release-branch.go1.12-security-net-textproto-don-t-n.patch<br>
deleted file mode 100644<br>
index 7b39dbd734..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0001-release-branch.go1.12-security-net-textproto-don-t-n.patch<br>
+++ /dev/null<br>
@@ -1,163 +0,0 @@<br>
-From 265b691ac440bfb711d8de323346f7d72e620efe Mon Sep 17 00:00:00 2001<br>
-From: Filippo Valsorda <<a href="mailto:filippo@golang.org" target="_blank">filippo@golang.org</a>><br>
-Date: Thu, 12 Sep 2019 12:37:36 -0400<br>
-Subject: [PATCH] [release-branch.go1.12-security] net/textproto: don't<br>
- normalize headers with spaces before the colon<br>
-<br>
-RFC 7230 is clear about headers with a space before the colon, like<br>
-<br>
-X-Answer : 42<br>
-<br>
-being invalid, but we've been accepting and normalizing them for compatibility<br>
-purposes since CL 5690059 in 2012.<br>
-<br>
-On the client side, this is harmless and indeed most browsers behave the same<br>
-to this day. On the server side, this becomes a security issue when the<br>
-behavior doesn't match that of a reverse proxy sitting in front of the server.<br>
-<br>
-For example, if a WAF accepts them without normalizing them, it might be<br>
-possible to bypass its filters, because the Go server would interpret the<br>
-header differently. Worse, if the reverse proxy coalesces requests onto a<br>
-single HTTP/1.1 connection to a Go server, the understanding of the request<br>
-boundaries can get out of sync between them, allowing an attacker to tack an<br>
-arbitrary method and path onto a request by other clients, including<br>
-authentication headers unknown to the attacker.<br>
-<br>
-This was recently presented at multiple security conferences:<br>
-<a href="https://portswigger.net/blog/http-desync-attacks-request-smuggling-reborn" rel="noreferrer" target="_blank">https://portswigger.net/blog/http-desync-attacks-request-smuggling-reborn</a><br>
-<br>
-net/http servers already reject header keys with invalid characters.<br>
-Simply stop normalizing extra spaces in net/textproto, let it return them<br>
-unchanged like it does for other invalid headers, and let net/http enforce<br>
-RFC 7230, which is HTTP specific. This loses us normalization on the client<br>
-side, but there's no right answer on the client side anyway, and hiding the<br>
-issue sounds worse than letting the application decide.<br>
-<br>
-Fixes CVE-2019-16276<br>
-<br>
-Change-Id: I6d272de827e0870da85d93df770d6a0e161bbcf1<br>
-Reviewed-on: <a href="https://team-review.git.corp.google.com/c/golang/go-private/+/549719-Reviewed-by" rel="noreferrer" target="_blank">https://team-review.git.corp.google.com/c/golang/go-private/+/549719<br>
-Reviewed-by</a>: Brad Fitzpatrick <<a href="mailto:bradfitz@google.com" target="_blank">bradfitz@google.com</a>><br>
-(cherry picked from commit 1280b868e82bf173ea3e988be3092d160ee66082)<br>
-Reviewed-on: <a href="https://team-review.git.corp.google.com/c/golang/go-private/+/558776-Reviewed-by" rel="noreferrer" target="_blank">https://team-review.git.corp.google.com/c/golang/go-private/+/558776<br>
-Reviewed-by</a>: Dmitri Shuralyov <<a href="mailto:dmitshur@google.com" target="_blank">dmitshur@google.com</a>><br>
-<br>
-CVE: CVE-2019-16276<br>
-<br>
-Upstream-Status: Backport [<a href="https://github.com/golang/go/commit/6e6f4aaf70c8b1cc81e65a26332aa9409de03ad8" rel="noreferrer" target="_blank">https://github.com/golang/go/commit/6e6f4aaf70c8b1cc81e65a26332aa9409de03ad8</a>]<br>
-<br>
-Signed-off-by: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" target="_blank">Qi.Chen@windriver.com</a>><br>
----<br>
- src/net/http/serve_test.go | 4 ++++<br>
- src/net/http/transport_test.go | 27 +++++++++++++++++++++++++++<br>
- src/net/textproto/reader.go | 10 ++--------<br>
- src/net/textproto/reader_test.go | 13 ++++++-------<br>
- 4 files changed, 39 insertions(+), 15 deletions(-)<br>
-<br>
-diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go<br>
-index 6eb0088a96..89bfdfbb82 100644<br>
---- a/src/net/http/serve_test.go<br>
-+++ b/src/net/http/serve_test.go<br>
-@@ -4748,6 +4748,10 @@ func TestServerValidatesHeaders(t *testing.T) {<br>
- {"foo\xffbar: foo\r\n", 400}, // binary in header<br>
- {"foo\x00bar: foo\r\n", 400}, // binary in header<br>
- {"Foo: " + strings.Repeat("x", 1<<21) + "\r\n", 431}, // header too large<br>
-+ // Spaces between the header key and colon are not allowed.<br>
-+ // See RFC 7230, Section 3.2.4.<br>
-+ {"Foo : bar\r\n", 400},<br>
-+ {"Foo\t: bar\r\n", 400},<br>
- <br>
- {"foo: foo foo\r\n", 200}, // LWS space is okay<br>
- {"foo: foo\tfoo\r\n", 200}, // LWS tab is okay<br>
-diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go<br>
-index 5c329543e2..5e5438a708 100644<br>
---- a/src/net/http/transport_test.go<br>
-+++ b/src/net/http/transport_test.go<br>
-@@ -5133,3 +5133,30 @@ func TestTransportIgnores408(t *testing.T) {<br>
- }<br>
- t.Fatalf("timeout after %v waiting for Transport connections to die off", time.Since(t0))<br>
- }<br>
-+<br>
-+func TestInvalidHeaderResponse(t *testing.T) {<br>
-+ setParallel(t)<br>
-+ defer afterTest(t)<br>
-+ cst := newClientServerTest(t, h1Mode, HandlerFunc(func(w ResponseWriter, r *Request) {<br>
-+ conn, buf, _ := w.(Hijacker).Hijack()<br>
-+ buf.Write([]byte("HTTP/1.1 200 OK\r\n" +<br>
-+ "Date: Wed, 30 Aug 2017 19:09:27 GMT\r\n" +<br>
-+ "Content-Type: text/html; charset=utf-8\r\n" +<br>
-+ "Content-Length: 0\r\n" +<br>
-+ "Foo : bar\r\n\r\n"))<br>
-+ buf.Flush()<br>
-+ conn.Close()<br>
-+ }))<br>
-+ defer cst.close()<br>
-+ res, err := cst.c.Get(cst.ts.URL)<br>
-+ if err != nil {<br>
-+ t.Fatal(err)<br>
-+ }<br>
-+ defer res.Body.Close()<br>
-+ if v := res.Header.Get("Foo"); v != "" {<br>
-+ t.Errorf(`unexpected "Foo" header: %q`, v)<br>
-+ }<br>
-+ if v := res.Header.Get("Foo "); v != "bar" {<br>
-+ t.Errorf(`bad "Foo " header value: %q, want %q`, v, "bar")<br>
-+ }<br>
-+}<br>
-diff --git a/src/net/textproto/reader.go b/src/net/textproto/reader.go<br>
-index 2c4f25d5ae..1a5e364cf7 100644<br>
---- a/src/net/textproto/reader.go<br>
-+++ b/src/net/textproto/reader.go<br>
-@@ -493,18 +493,12 @@ func (r *Reader) ReadMIMEHeader() (MIMEHeader, error) {<br>
- return m, err<br>
- }<br>
- <br>
-- // Key ends at first colon; should not have trailing spaces<br>
-- // but they appear in the wild, violating specs, so we remove<br>
-- // them if present.<br>
-+ // Key ends at first colon.<br>
- i := bytes.IndexByte(kv, ':')<br>
- if i < 0 {<br>
- return m, ProtocolError("malformed MIME header line: " + string(kv))<br>
- }<br>
-- endKey := i<br>
-- for endKey > 0 && kv[endKey-1] == ' ' {<br>
-- endKey--<br>
-- }<br>
-- key := canonicalMIMEHeaderKey(kv[:endKey])<br>
-+ key := canonicalMIMEHeaderKey(kv[:i])<br>
- <br>
- // As per RFC 7230 field-name is a token, tokens consist of one or more chars.<br>
- // We could return a ProtocolError here, but better to be liberal in what we<br>
-diff --git a/src/net/textproto/reader_test.go b/src/net/textproto/reader_test.go<br>
-index f85fbdc36d..b92fdcd3c7 100644<br>
---- a/src/net/textproto/reader_test.go<br>
-+++ b/src/net/textproto/reader_test.go<br>
-@@ -188,11 +188,10 @@ func TestLargeReadMIMEHeader(t *testing.T) {<br>
- }<br>
- }<br>
- <br>
--// Test that we read slightly-bogus MIME headers seen in the wild,<br>
--// with spaces before colons, and spaces in keys.<br>
-+// TestReadMIMEHeaderNonCompliant checks that we don't normalize headers<br>
-+// with spaces before colons, and accept spaces in keys.<br>
- func TestReadMIMEHeaderNonCompliant(t *testing.T) {<br>
-- // Invalid HTTP response header as sent by an Axis security<br>
-- // camera: (this is handled by IE, Firefox, Chrome, curl, etc.)<br>
-+ // These invalid headers will be rejected by net/http according to RFC 7230.<br>
- r := reader("Foo: bar\r\n" +<br>
- "Content-Language: en\r\n" +<br>
- "SID : 0\r\n" +<br>
-@@ -202,9 +201,9 @@ func TestReadMIMEHeaderNonCompliant(t *testing.T) {<br>
- want := MIMEHeader{<br>
- "Foo": {"bar"},<br>
- "Content-Language": {"en"},<br>
-- "Sid": {"0"},<br>
-- "Audio Mode": {"None"},<br>
-- "Privilege": {"127"},<br>
-+ "SID ": {"0"},<br>
-+ "Audio Mode ": {"None"},<br>
-+ "Privilege ": {"127"},<br>
- }<br>
- if !reflect.DeepEqual(m, want) || err != nil {<br>
- t.Fatalf("ReadMIMEHeader =\n%v, %v; want:\n%v", m, err, want)<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.12/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch<br>
deleted file mode 100644<br>
index 66b8561874..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch<br>
+++ /dev/null<br>
@@ -1,218 +0,0 @@<br>
-From 47db69e20ed66fb62b01affd83d829654b829893 Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Mon, 19 Feb 2018 08:50:59 -0800<br>
-Subject: [PATCH] cmd/go: make content-based hash generation less pedantic<br>
-<br>
-Go 1.10's build tool now uses content-based hashes to<br>
-determine when something should be built or re-built.<br>
-This same mechanism is used to maintain a built-artifact<br>
-cache for speeding up builds.<br>
-<br>
-However, the hashes it generates include information that<br>
-doesn't work well with OE, nor with using a shared runtime<br>
-library.<br>
-<br>
-First, it embeds path names to source files, unless<br>
-building within GOROOT. This prevents the building<br>
-of a package in GOPATH for later staging into GOROOT.<br>
-<br>
-This patch adds support for the environment variable<br>
-GOPATH_OMIT_IN_ACTIONID. If present, path name<br>
-embedding is disabled.<br>
-<br>
-Second, if cgo is enabled, the build ID for cgo-related<br>
-packages will include the current value of the environment<br>
-variables for invoking the compiler (CC, CXX, FC) and<br>
-any CGO_xxFLAGS variables. Only if the settings used<br>
-during a compilation exactly match, character for character,<br>
-the values used for compiling runtime/cgo or any other<br>
-cgo-enabled package being imported, will the tool<br>
-decide that the imported package is up-to-date.<br>
-<br>
-This is done to help ensure correctness, but is overly<br>
-simplistic and effectively prevents the reuse of built<br>
-artifacts that use cgo (or shared runtime, which includes<br>
-runtime/cgo).<br>
-<br>
-This patch filters out all compiler flags except those<br>
-beginning with '-m'. The default behavior can be restored<br>
-by setting the CGO_PEDANTIC environment variable.<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
----<br>
- src/cmd/go/internal/envcmd/env.go | 2 +-<br>
- src/cmd/go/internal/work/exec.go | 63 ++++++++++++++++++++++---------<br>
- 2 files changed, 46 insertions(+), 19 deletions(-)<br>
-<br>
-diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go<br>
-index cedbfbf..5763a0d 100644<br>
---- a/src/cmd/go/internal/envcmd/env.go<br>
-+++ b/src/cmd/go/internal/envcmd/env.go<br>
-@@ -128,7 +128,7 @@ func ExtraEnvVars() []cfg.EnvVar {<br>
- func ExtraEnvVarsCostly() []cfg.EnvVar {<br>
- var b work.Builder<br>
- b.Init()<br>
-- cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{})<br>
-+ cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false)<br>
- if err != nil {<br>
- // Should not happen - b.CFlags was given an empty package.<br>
- fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err)<br>
-diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go<br>
-index 12e1527..e41bfac 100644<br>
---- a/src/cmd/go/internal/work/exec.go<br>
-+++ b/src/cmd/go/internal/work/exec.go<br>
-@@ -174,6 +174,8 @@ func (b *Builder) Do(root *Action) {<br>
- wg.Wait()<br>
- }<br>
- <br>
-+var omitGopath = os.Getenv("GOPATH_OMIT_IN_ACTIONID") != ""<br>
-+<br>
- // buildActionID computes the action ID for a build action.<br>
- func (b *Builder) buildActionID(a *Action) cache.ActionID {<br>
- p := a.Package<br>
-@@ -190,7 +192,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {<br>
- // but it does not hide the exact value of $GOPATH.<br>
- // Include the full dir in that case.<br>
- // Assume b.WorkDir is being trimmed properly.<br>
-- if !p.Goroot && !strings.HasPrefix(p.Dir, b.WorkDir) {<br>
-+ if !p.Goroot && !omitGopath && !strings.HasPrefix(p.Dir, b.WorkDir) {<br>
- fmt.Fprintf(h, "dir %s\n", p.Dir)<br>
- }<br>
- fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch)<br>
-@@ -201,13 +203,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {<br>
- }<br>
- if len(p.CgoFiles)+len(p.SwigFiles) > 0 {<br>
- fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo"))<br>
-- cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p)<br>
-- fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(), cppflags, cflags, ldflags)<br>
-+ cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true)<br>
-+ fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(true), cppflags, cflags, ldflags)<br>
- if len(p.CXXFiles)+len(p.SwigFiles) > 0 {<br>
-- fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(), cxxflags)<br>
-+ fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(true), cxxflags)<br>
- }<br>
- if len(p.FFiles) > 0 {<br>
-- fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(), fflags)<br>
-+ fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(true), fflags)<br>
- }<br>
- // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions?<br>
- }<br>
-@@ -2096,33 +2098,33 @@ var (<br>
- // gccCmd returns a gcc command line prefix<br>
- // defaultCC is defined in zdefaultcc.go, written by cmd/dist.<br>
- func (b *Builder) GccCmd(incdir, workdir string) []string {<br>
-- return b.compilerCmd(b.ccExe(), incdir, workdir)<br>
-+ return b.compilerCmd(b.ccExe(false), incdir, workdir)<br>
- }<br>
- <br>
- // gxxCmd returns a g++ command line prefix<br>
- // defaultCXX is defined in zdefaultcc.go, written by cmd/dist.<br>
- func (b *Builder) GxxCmd(incdir, workdir string) []string {<br>
-- return b.compilerCmd(b.cxxExe(), incdir, workdir)<br>
-+ return b.compilerCmd(b.cxxExe(false), incdir, workdir)<br>
- }<br>
- <br>
- // gfortranCmd returns a gfortran command line prefix.<br>
- func (b *Builder) gfortranCmd(incdir, workdir string) []string {<br>
-- return b.compilerCmd(b.fcExe(), incdir, workdir)<br>
-+ return b.compilerCmd(b.fcExe(false), incdir, workdir)<br>
- }<br>
- <br>
- // ccExe returns the CC compiler setting without all the extra flags we add implicitly.<br>
--func (b *Builder) ccExe() []string {<br>
-- return b.compilerExe(origCC, cfg.DefaultCC(cfg.Goos, cfg.Goarch))<br>
-+func (b *Builder) ccExe(filtered bool) []string {<br>
-+ return b.compilerExe(origCC, cfg.DefaultCC(cfg.Goos, cfg.Goarch), filtered)<br>
- }<br>
- <br>
- // cxxExe returns the CXX compiler setting without all the extra flags we add implicitly.<br>
--func (b *Builder) cxxExe() []string {<br>
-- return b.compilerExe(origCXX, cfg.DefaultCXX(cfg.Goos, cfg.Goarch))<br>
-+func (b *Builder) cxxExe(filtered bool) []string {<br>
-+ return b.compilerExe(origCXX, cfg.DefaultCXX(cfg.Goos, cfg.Goarch), filtered)<br>
- }<br>
- <br>
- // fcExe returns the FC compiler setting without all the extra flags we add implicitly.<br>
--func (b *Builder) fcExe() []string {<br>
-- return b.compilerExe(os.Getenv("FC"), "gfortran")<br>
-+func (b *Builder) fcExe(filtered bool) []string {<br>
-+ return b.compilerExe(os.Getenv("FC"), "gfortran", filtered)<br>
- }<br>
- <br>
- // compilerExe returns the compiler to use given an<br>
-@@ -2131,11 +2133,14 @@ func (b *Builder) fcExe() []string {<br>
- // of the compiler but can have additional arguments if they<br>
- // were present in the environment value.<br>
- // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"].<br>
--func (b *Builder) compilerExe(envValue string, def string) []string {<br>
-+func (b *Builder) compilerExe(envValue string, def string, filtered bool) []string {<br>
- compiler := strings.Fields(envValue)<br>
- if len(compiler) == 0 {<br>
- compiler = []string{def}<br>
- }<br>
-+ if filtered {<br>
-+ return append(compiler[0:1], filterCompilerFlags(compiler[1:])...)<br>
-+ }<br>
- return compiler<br>
- }<br>
- <br>
-@@ -2285,8 +2290,23 @@ func envList(key, def string) []string {<br>
- return strings.Fields(v)<br>
- }<br>
- <br>
-+var filterFlags = os.Getenv("CGO_PEDANTIC") == ""<br>
-+<br>
-+func filterCompilerFlags(flags []string) []string {<br>
-+ var newflags []string<br>
-+ if !filterFlags {<br>
-+ return flags<br>
-+ }<br>
-+ for _, flag := range flags {<br>
-+ if strings.HasPrefix(flag, "-m") {<br>
-+ newflags = append(newflags, flag)<br>
-+ }<br>
-+ }<br>
-+ return newflags<br>
-+}<br>
-+<br>
- // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo.<br>
--func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) {<br>
-+func (b *Builder) CFlags(p *load.Package, filtered bool) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) {<br>
- defaults := "-g -O2"<br>
- <br>
- if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil {<br>
-@@ -2304,6 +2324,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l<br>
- if ldflags, err = buildFlags("LDFLAGS", defaults, p.CgoLDFLAGS, checkLinkerFlags); err != nil {<br>
- return<br>
- }<br>
-+ if filtered {<br>
-+ cppflags = filterCompilerFlags(cppflags)<br>
-+ cflags = filterCompilerFlags(cflags)<br>
-+ cxxflags = filterCompilerFlags(cxxflags)<br>
-+ fflags = filterCompilerFlags(fflags)<br>
-+ ldflags = filterCompilerFlags(ldflags)<br>
-+ }<br>
- <br>
- return<br>
- }<br>
-@@ -2319,7 +2346,7 @@ var cgoRe = regexp.MustCompile(`[/\\:]`)<br>
- <br>
- func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) {<br>
- p := a.Package<br>
-- cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p)<br>
-+ cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p, false)<br>
- if err != nil {<br>
- return nil, nil, err<br>
- }<br>
-@@ -2679,7 +2706,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) {<br>
- <br>
- // Run SWIG on one SWIG input file.<br>
- func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) {<br>
-- cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p)<br>
-+ cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p, false)<br>
- if err != nil {<br>
- return "", "", err<br>
- }<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.12/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch<br>
deleted file mode 100644<br>
index b6ca40edee..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch<br>
+++ /dev/null<br>
@@ -1,48 +0,0 @@<br>
-From 5c32c38bf19b24f0aadd78012d17ff5caa82151e Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Sat, 17 Feb 2018 05:24:20 -0800<br>
-Subject: [PATCH] allow GOTOOLDIR to be overridden in the environment<br>
-<br>
-to allow for split host/target build roots<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
----<br>
- src/cmd/dist/build.go | 4 +++-<br>
- src/cmd/go/internal/cfg/cfg.go | 7 +++++--<br>
- 2 files changed, 8 insertions(+), 3 deletions(-)<br>
-<br>
-Index: go/src/cmd/dist/build.go<br>
-===================================================================<br>
---- go.orig/src/cmd/dist/build.go<br>
-+++ go/src/cmd/dist/build.go<br>
-@@ -228,7 +228,9 @@ func xinit() {<br>
- workdir = xworkdir()<br>
- xatexit(rmworkdir)<br>
- <br>
-- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)<br>
-+ if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {<br>
-+ tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)<br>
-+ }<br>
- }<br>
- <br>
- // compilerEnv returns a map from "goos/goarch" to the<br>
-Index: go/src/cmd/go/internal/cfg/cfg.go<br>
-===================================================================<br>
---- go.orig/src/cmd/go/internal/cfg/cfg.go<br>
-+++ go/src/cmd/go/internal/cfg/cfg.go<br>
-@@ -116,7 +116,11 @@ func init() {<br>
- // variables. This matches the initialization of ToolDir in<br>
- // go/build, except for using GOROOT rather than<br>
- // runtime.GOROOT.<br>
-- build.ToolDir = filepath.Join(GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)<br>
-+ if s := os.Getenv("GOTOOLDIR"); s != "" {<br>
-+ build.ToolDir = filepath.Clean(s)<br>
-+ } else {<br>
-+ build.ToolDir = filepath.Join(GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)<br>
-+ }<br>
- }<br>
- }<br>
- <br>
diff --git a/meta/recipes-devtools/go/go-1.12/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.12/0004-ld-add-soname-to-shareable-objects.patch<br>
deleted file mode 100644<br>
index 004a33a023..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0004-ld-add-soname-to-shareable-objects.patch<br>
+++ /dev/null<br>
@@ -1,45 +0,0 @@<br>
-From 55eb8c95a89f32aec16b7764e78e8cf75169dc81 Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Sat, 17 Feb 2018 06:26:10 -0800<br>
-Subject: [PATCH] ld: add soname to shareable objects<br>
-<br>
-so that OE's shared library dependency handling<br>
-can find them.<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
----<br>
- src/cmd/link/internal/ld/lib.go | 4 ++++<br>
- 1 file changed, 4 insertions(+)<br>
-<br>
-diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go<br>
-index 220aab3..703925f 100644<br>
---- a/src/cmd/link/internal/ld/lib.go<br>
-+++ b/src/cmd/link/internal/ld/lib.go<br>
-@@ -1135,6 +1135,7 @@ func (ctxt *Link) hostlink() {<br>
- argv = append(argv, "-Wl,-z,relro")<br>
- }<br>
- argv = append(argv, "-shared")<br>
-+ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))<br>
- if ctxt.HeadType != objabi.Hwindows {<br>
- // Pass -z nodelete to mark the shared library as<br>
- // non-closeable: a dlclose will do nothing.<br>
-@@ -1146,6 +1147,8 @@ func (ctxt *Link) hostlink() {<br>
- argv = append(argv, "-Wl,-z,relro")<br>
- }<br>
- argv = append(argv, "-shared")<br>
-+ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))<br>
-+<br>
- case BuildModePlugin:<br>
- if ctxt.HeadType == objabi.Hdarwin {<br>
- argv = append(argv, "-dynamiclib")<br>
-@@ -1154,6 +1157,7 @@ func (ctxt *Link) hostlink() {<br>
- argv = append(argv, "-Wl,-z,relro")<br>
- }<br>
- argv = append(argv, "-shared")<br>
-+ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))<br>
- }<br>
- }<br>
- <br>
diff --git a/meta/recipes-devtools/go/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch<br>
deleted file mode 100644<br>
index ace8de9eae..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch<br>
+++ /dev/null<br>
@@ -1,37 +0,0 @@<br>
-From 1bf15aa8fb773604b2524cfdab493fa4d8fa9285 Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Sat, 17 Feb 2018 06:32:45 -0800<br>
-Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap<br>
-<br>
-for handling OE cross-canadian builds.<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
----<br>
- src/make.bash | 4 ++--<br>
- 1 file changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/src/make.bash b/src/make.bash<br>
-index 78882d9..25943d0 100755<br>
---- a/src/make.bash<br>
-+++ b/src/make.bash<br>
-@@ -163,7 +163,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then<br>
- exit 1<br>
- fi<br>
- rm -f cmd/dist/dist<br>
--GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist<br>
-+CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist<br>
- <br>
- # -e doesn't propagate out of eval, so check success by hand.<br>
- eval $(./cmd/dist/dist env -p || echo FAIL=true)<br>
-@@ -194,7 +194,7 @@ fi<br>
- # Run dist bootstrap to complete make.bash.<br>
- # Bootstrap installs a proper cmd/dist, built with the new toolchain.<br>
- # Throw ours, built with Go 1.4, away after bootstrap.<br>
--./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"<br>
-+CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"<br>
- rm -f ./cmd/dist/dist<br>
- <br>
- # DO NOT ADD ANY NEW CODE HERE.<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.12/0006-cmd-dist-separate-host-and-target-builds.patch<br>
deleted file mode 100644<br>
index 0c0d5da80a..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0006-cmd-dist-separate-host-and-target-builds.patch<br>
+++ /dev/null<br>
@@ -1,282 +0,0 @@<br>
-From fe0fcaf43ef3aab81541dad2a71b46254dc4cf6a Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Sat, 17 Feb 2018 10:03:48 -0800<br>
-Subject: [PATCH] cmd/dist: separate host and target builds<br>
-<br>
-Change the dist tool to allow for OE-style cross-<br>
-and cross-canadian builds:<br>
-<br>
- - command flags --host-only and --target only are added;<br>
- if one is present, the other changes mentioned below<br>
- take effect, and arguments may also be specified on<br>
- the command line to enumerate the package(s) to be<br>
- built.<br>
-<br>
- - for OE cross builds, go_bootstrap is always built for<br>
- the current build host, and is moved, along with the supporting<br>
- toolchain (asm, compile, etc.) to a separate 'native_native'<br>
- directory under GOROOT/pkg/tool.<br>
-<br>
- - go_bootstrap is not automatically removed after the build,<br>
- so it can be reused later (e.g., building both static and<br>
- shared runtime).<br>
-<br>
-Note that for --host-only builds, it would be nice to specify<br>
-just the "cmd" package to build only the go commands/tools,<br>
-the staleness checks in the dist tool will fail if the "std"<br>
-library has not also been built. So host-only builds have to<br>
-build everything anyway.<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
-more dist cleanup<br>
-<br>
----<br>
- src/cmd/dist/build.go | 153 ++++++++++++++++++++++++++++++------------<br>
- 1 file changed, 111 insertions(+), 42 deletions(-)<br>
-<br>
-Index: go/src/cmd/dist/build.go<br>
-===================================================================<br>
---- go.orig/src/cmd/dist/build.go<br>
-+++ go/src/cmd/dist/build.go<br>
-@@ -39,6 +39,7 @@ var (<br>
- goldflags string<br>
- workdir string<br>
- tooldir string<br>
-+ build_tooldir string<br>
- oldgoos string<br>
- oldgoarch string<br>
- exe string<br>
-@@ -50,6 +51,7 @@ var (<br>
- <br>
- rebuildall bool<br>
- defaultclang bool<br>
-+ crossBuild bool<br>
- <br>
- vflag int // verbosity<br>
- )<br>
-@@ -231,6 +233,8 @@ func xinit() {<br>
- if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {<br>
- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)<br>
- }<br>
-+ build_tooldir = pathf("%s/pkg/tool/native_native", goroot)<br>
-+<br>
- }<br>
- <br>
- // compilerEnv returns a map from "goos/goarch" to the<br>
-@@ -260,7 +264,6 @@ func compilerEnv(envName, def string) ma<br>
- if gohostos != goos || gohostarch != goarch {<br>
- m[gohostos+"/"+gohostarch] = m[""]<br>
- }<br>
-- m[""] = env<br>
- }<br>
- <br>
- for _, goos := range okgoos {<br>
-@@ -487,8 +490,10 @@ func setup() {<br>
- // We keep it in pkg/, just like the object directory above.<br>
- if rebuildall {<br>
- xremoveall(tooldir)<br>
-+ xremoveall(build_tooldir)<br>
- }<br>
- xmkdirall(tooldir)<br>
-+ xmkdirall(build_tooldir)<br>
- <br>
- // Remove tool binaries from before the tool/gohostos_gohostarch<br>
- xremoveall(pathf("%s/bin/tool", goroot))<br>
-@@ -1155,11 +1160,29 @@ func cmdbootstrap() {<br>
- <br>
- var noBanner bool<br>
- var debug bool<br>
-+ var hostOnly bool<br>
-+ var targetOnly bool<br>
-+ var toBuild = []string { "std", "cmd" }<br>
-+<br>
- flag.BoolVar(&rebuildall, "a", rebuildall, "rebuild all")<br>
- flag.BoolVar(&debug, "d", debug, "enable debugging of bootstrap process")<br>
- flag.BoolVar(&noBanner, "no-banner", noBanner, "do not print banner")<br>
-+ flag.BoolVar(&hostOnly, "host-only", hostOnly, "build only host binaries, not target")<br>
-+ flag.BoolVar(&targetOnly, "target-only", targetOnly, "build only target binaries, not host")<br>
- <br>
-- xflagparse(0)<br>
-+ xflagparse(-1)<br>
-+<br>
-+ if (hostOnly && targetOnly) {<br>
-+ fatalf("specify only one of --host-only or --target-only\n")<br>
-+ }<br>
-+ crossBuild = hostOnly || targetOnly<br>
-+ if flag.NArg() > 0 {<br>
-+ if crossBuild {<br>
-+ toBuild = flag.Args()<br>
-+ } else {<br>
-+ fatalf("package names not permitted without --host-only or --target-only\n")<br>
-+ }<br>
-+ }<br>
- <br>
- if debug {<br>
- // cmd/buildid is used in debug mode.<br>
-@@ -1207,8 +1230,13 @@ func cmdbootstrap() {<br>
- xprintf("\n")<br>
- }<br>
- <br>
-- gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now<br>
-- goldflags = os.Getenv("GO_LDFLAGS")<br>
-+ // For split host/target cross/cross-canadian builds, we don't<br>
-+ // want to be setting these flags until after we have compiled<br>
-+ // the toolchain that runs on the build host.<br>
-+ if ! crossBuild {<br>
-+ gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now<br>
-+ goldflags = os.Getenv("GO_LDFLAGS")<br>
-+ }<br>
- goBootstrap := pathf("%s/go_bootstrap", tooldir)<br>
- cmdGo := pathf("%s/go", gobin)<br>
- if debug {<br>
-@@ -1237,7 +1265,11 @@ func cmdbootstrap() {<br>
- xprintf("\n")<br>
- }<br>
- xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n")<br>
-- os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
-+ if crossBuild {<br>
-+ os.Setenv("CC", defaultcc[""])<br>
-+ } else {<br>
-+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
-+ }<br>
- goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...)<br>
- if debug {<br>
- run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")<br>
-@@ -1274,50 +1306,84 @@ func cmdbootstrap() {<br>
- }<br>
- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)<br>
- <br>
-- if goos == oldgoos && goarch == oldgoarch {<br>
-- // Common case - not setting up for cross-compilation.<br>
-- timelog("build", "toolchain")<br>
-- if vflag > 0 {<br>
-- xprintf("\n")<br>
-+ if crossBuild {<br>
-+ gogcflags = os.Getenv("GO_GCFLAGS")<br>
-+ goldflags = os.Getenv("GO_LDFLAGS")<br>
-+ tool_files, _ := filepath.Glob(pathf("%s/*", tooldir))<br>
-+ for _, f := range tool_files {<br>
-+ copyfile(pathf("%s/%s", build_tooldir, filepath.Base(f)), f, writeExec)<br>
-+ xremove(f)<br>
-+ }<br>
-+ os.Setenv("GOTOOLDIR", build_tooldir)<br>
-+ goBootstrap = pathf("%s/go_bootstrap", build_tooldir)<br>
-+ if hostOnly {<br>
-+ timelog("build", "host toolchain")<br>
-+ if vflag > 0 {<br>
-+ xprintf("\n")<br>
-+ }<br>
-+ xprintf("Building %s for host, %s/%s.\n", strings.Join(toBuild, ","), goos, goarch)<br>
-+ goInstall(goBootstrap, toBuild...)<br>
-+ checkNotStale(goBootstrap, toBuild...)<br>
-+ // Skip cmdGo staleness checks here, since we can't necessarily run the cmdGo binary<br>
-+<br>
-+ timelog("build", "target toolchain")<br>
-+ if vflag > 0 {<br>
-+ xprintf("\n")<br>
-+ }<br>
-+ } else if targetOnly {<br>
-+ goos = oldgoos<br>
-+ goarch = oldgoarch<br>
-+ os.Setenv("GOOS", goos)<br>
-+ os.Setenv("GOARCH", goarch)<br>
-+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
-+ xprintf("Building %s for target, %s/%s.\n", strings.Join(toBuild, ","), goos, goarch)<br>
-+ goInstall(goBootstrap, toBuild...)<br>
-+ checkNotStale(goBootstrap, toBuild...)<br>
-+ // Skip cmdGo staleness checks here, since we can't run the target's cmdGo binary<br>
- }<br>
-- xprintf("Building packages and commands for %s/%s.\n", goos, goarch)<br>
- } else {<br>
-- // GOOS/GOARCH does not match GOHOSTOS/GOHOSTARCH.<br>
-- // Finish GOHOSTOS/GOHOSTARCH installation and then<br>
-- // run GOOS/GOARCH installation.<br>
-- timelog("build", "host toolchain")<br>
-- if vflag > 0 {<br>
-- xprintf("\n")<br>
-+<br>
-+ if goos == oldgoos && goarch == oldgoarch {<br>
-+ // Common case - not setting up for cross-compilation.<br>
-+ timelog("build", "toolchain")<br>
-+ if vflag > 0 {<br>
-+ xprintf("\n")<br>
-+ }<br>
-+ xprintf("Building packages and commands for %s/%s.\n", goos, goarch)<br>
-+ } else {<br>
-+ // GOOS/GOARCH does not match GOHOSTOS/GOHOSTARCH.<br>
-+ // Finish GOHOSTOS/GOHOSTARCH installation and then<br>
-+ // run GOOS/GOARCH installation.<br>
-+ timelog("build", "host toolchain")<br>
-+ if vflag > 0 {<br>
-+ xprintf("\n")<br>
-+ }<br>
-+ xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)<br>
-+ goInstall(goBootstrap, "std", "cmd")<br>
-+ checkNotStale(goBootstrap, "std", "cmd")<br>
-+ checkNotStale(cmdGo, "std", "cmd")<br>
-+<br>
-+ timelog("build", "target toolchain")<br>
-+ if vflag > 0 {<br>
-+ xprintf("\n")<br>
-+ }<br>
-+ goos = oldgoos<br>
-+ goarch = oldgoarch<br>
-+ os.Setenv("GOOS", goos)<br>
-+ os.Setenv("GOARCH", goarch)<br>
-+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
-+ xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)<br>
- }<br>
-- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)<br>
- goInstall(goBootstrap, "std", "cmd")<br>
- checkNotStale(goBootstrap, "std", "cmd")<br>
- checkNotStale(cmdGo, "std", "cmd")<br>
- <br>
-- timelog("build", "target toolchain")<br>
-- if vflag > 0 {<br>
-- xprintf("\n")<br>
-- }<br>
-- goos = oldgoos<br>
-- goarch = oldgoarch<br>
-- os.Setenv("GOOS", goos)<br>
-- os.Setenv("GOARCH", goarch)<br>
-- os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
-- xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)<br>
-- }<br>
-- targets := []string{"std", "cmd"}<br>
-- if goos == "js" && goarch == "wasm" {<br>
-- // Skip the cmd tools for js/wasm. They're not usable.<br>
-- targets = targets[:1]<br>
-- }<br>
-- goInstall(goBootstrap, targets...)<br>
-- checkNotStale(goBootstrap, targets...)<br>
-- checkNotStale(cmdGo, targets...)<br>
-- if debug {<br>
-- run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")<br>
-- run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))<br>
-- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)<br>
-- copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)<br>
-+ if debug {<br>
-+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")<br>
-+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))<br>
-+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)<br>
-+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)<br>
-+ }<br>
- }<br>
- <br>
- // Check that there are no new files in $GOROOT/bin other than<br>
-@@ -1335,7 +1401,11 @@ func cmdbootstrap() {<br>
- }<br>
- <br>
- // Remove go_bootstrap now that we're done.<br>
-- xremove(pathf("%s/go_bootstrap", tooldir))<br>
-+ // Except that for split host/target cross-builds, we need to<br>
-+ // keep it.<br>
-+ if ! crossBuild {<br>
-+ xremove(pathf("%s/go_bootstrap", tooldir))<br>
-+ }<br>
- <br>
- // Print trailing banner unless instructed otherwise.<br>
- if !noBanner {<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.12/0007-cmd-go-make-GOROOT-precious-by-default.patch<br>
deleted file mode 100644<br>
index 29ef947abd..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0007-cmd-go-make-GOROOT-precious-by-default.patch<br>
+++ /dev/null<br>
@@ -1,106 +0,0 @@<br>
-From 7cc60b3887be2d5674b9f5d422d022976cf205e5 Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Fri, 2 Mar 2018 06:00:20 -0800<br>
-Subject: [PATCH] cmd/go: make GOROOT precious by default<br>
-<br>
-The go build tool normally rebuilds whatever it detects is<br>
-stale. This can be a problem when GOROOT is intended to<br>
-be read-only and the go runtime has been built as a shared<br>
-library, since we don't want every application to be rebuilding<br>
-the shared runtime - particularly in cross-build/packaging<br>
-setups, since that would lead to 'abi mismatch' runtime errors.<br>
-<br>
-This patch prevents the install and linkshared actions from<br>
-installing to GOROOT unless overridden with the GOROOT_OVERRIDE<br>
-environment variable.<br>
-<br>
-Upstream-Status: Inappropriate [OE specific]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
----<br>
- src/cmd/go/internal/work/action.go | 3 +++<br>
- src/cmd/go/internal/work/build.go | 5 +++++<br>
- src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++<br>
- 3 files changed, 33 insertions(+)<br>
-<br>
-Index: go/src/cmd/go/internal/work/action.go<br>
-===================================================================<br>
---- go.orig/src/cmd/go/internal/work/action.go<br>
-+++ go/src/cmd/go/internal/work/action.go<br>
-@@ -600,6 +600,9 @@ func (b *Builder) addTransitiveLinkDeps(<br>
- if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] {<br>
- continue<br>
- }<br>
-+ if goRootPrecious && (p1.Standard || p1.Goroot) {<br>
-+ continue<br>
-+ }<br>
- haveShlib[filepath.Base(p1.Shlib)] = true<br>
- // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild,<br>
- // we'll end up building an overall library or executable that depends at runtime<br>
-Index: go/src/cmd/go/internal/work/build.go<br>
-===================================================================<br>
---- go.orig/src/cmd/go/internal/work/build.go<br>
-+++ go/src/cmd/go/internal/work/build.go<br>
-@@ -147,6 +147,7 @@ See also: go install, go get, go clean.<br>
- }<br>
- <br>
- const concurrentGCBackendCompilationEnabledByDefault = true<br>
-+var goRootPrecious bool = true<br>
- <br>
- func init() {<br>
- // break init cycle<br>
-@@ -160,6 +161,10 @@ func init() {<br>
- <br>
- AddBuildFlags(CmdBuild)<br>
- AddBuildFlags(CmdInstall)<br>
-+<br>
-+ if x := os.Getenv("GOROOT_OVERRIDE"); x != "" {<br>
-+ goRootPrecious = false<br>
-+ }<br>
- }<br>
- <br>
- // Note that flags consulted by other parts of the code<br>
-Index: go/src/cmd/go/internal/work/exec.go<br>
-===================================================================<br>
---- go.orig/src/cmd/go/internal/work/exec.go<br>
-+++ go/src/cmd/go/internal/work/exec.go<br>
-@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err<br>
- return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target)<br>
- }<br>
- <br>
-+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {<br>
-+ _, err := os.Stat(a.Package.Target)<br>
-+ if err == nil {<br>
-+ a.built = a.Package.Target<br>
-+ a.Target = a.Package.Target<br>
-+ a.buildID = b.fileHash(a.Package.Target)<br>
-+ a.Package.Stale = false<br>
-+ a.Package.StaleReason = "GOROOT-resident package"<br>
-+ return nil<br>
-+ }<br>
-+ a.Package.Stale = true<br>
-+ a.Package.StaleReason = "missing or invalid GOROOT-resident package"<br>
-+ if b.IsCmdList {<br>
-+ return nil<br>
-+ }<br>
-+ }<br>
-+<br>
- if err := b.Mkdir(a.Objdir); err != nil {<br>
- return err<br>
- }<br>
-@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act<br>
- return nil<br>
- }<br>
- <br>
-+ if goRootPrecious && a.Package != nil {<br>
-+ p := a.Package<br>
-+ if p.Standard || p.Goroot {<br>
-+ err := fmt.Errorf("attempting to install package %s into read-only GOROOT", p.ImportPath)<br>
-+ return err<br>
-+ }<br>
-+ }<br>
-+<br>
- if err := b.Mkdir(a.Objdir); err != nil {<br>
- return err<br>
- }<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch<br>
deleted file mode 100644<br>
index 225cf439c5..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch<br>
+++ /dev/null<br>
@@ -1,37 +0,0 @@<br>
-From 0e0c247f0caec23528889ff09d98348cba9028f1 Mon Sep 17 00:00:00 2001<br>
-From: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com" target="_blank">hongxu.jia@windriver.com</a>><br>
-Date: Fri, 26 Oct 2018 15:02:32 +0800<br>
-Subject: [PATCH] use GOBUILDMODE to set buildmode<br>
-<br>
-While building go itself, the go build system does not support<br>
-to set `-buildmode=pie' from environment.<br>
-<br>
-Add GOBUILDMODE to support it which make PIE executables the default<br>
-build mode, as PIE executables are required as of Yocto<br>
-<br>
-Refers: <a href="https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI-Upstream-Status" rel="noreferrer" target="_blank">https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI<br>
-Upstream-Status</a>: Denied [upstream choose antoher solution: `17a256b<br>
-cmd/go: -buildmode=pie for android/arm']<br>
-<br>
-Signed-off-by: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com" target="_blank">hongxu.jia@windriver.com</a>><br>
----<br>
- src/cmd/go/internal/work/build.go | 6 +++++-<br>
- 1 file changed, 5 insertions(+), 1 deletion(-)<br>
-<br>
-Index: go/src/cmd/go/internal/work/build.go<br>
-===================================================================<br>
---- go.orig/src/cmd/go/internal/work/build.go<br>
-+++ go/src/cmd/go/internal/work/build.go<br>
-@@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) {<br>
- <br>
- cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "")<br>
- cmd.Flag.Var(buildCompiler{}, "compiler", "")<br>
-- cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")<br>
-+ if bm := os.Getenv("GOBUILDMODE"); bm != "" {<br>
-+ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", bm, "")<br>
-+ } else {<br>
-+ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")<br>
-+ }<br>
- cmd.Flag.Var(&load.BuildGcflags, "gcflags", "")<br>
- cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "")<br>
- cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "")<br>
diff --git a/meta/recipes-devtools/go/go-1.12/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.12/0009-ld-replace-glibc-dynamic-linker-with-musl.patch<br>
deleted file mode 100644<br>
index 840cf4bbd7..0000000000<br>
--- a/meta/recipes-devtools/go/go-1.12/0009-ld-replace-glibc-dynamic-linker-with-musl.patch<br>
+++ /dev/null<br>
@@ -1,112 +0,0 @@<br>
-From 35ea4be34e94912b00837e0f7c7385f2e98fe769 Mon Sep 17 00:00:00 2001<br>
-From: Matt Madison <matt@madison.systems><br>
-Date: Sun, 18 Feb 2018 08:24:05 -0800<br>
-Subject: [PATCH] ld: replace glibc dynamic linker with musl<br>
-<br>
-Rework of patch by Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
-for go 1.10. Should be applied conditionally on<br>
-musl being the system C library.<br>
-<br>
-Upstream-Status: Inappropriate [Real fix should be portable across libcs]<br>
-<br>
-Signed-off-by: Matt Madison <matt@madison.systems><br>
-<br>
----<br>
- src/cmd/link/internal/amd64/obj.go | 2 +-<br>
- src/cmd/link/internal/arm/obj.go | 2 +-<br>
- src/cmd/link/internal/arm64/obj.go | 2 +-<br>
- src/cmd/link/internal/mips/obj.go | 2 +-<br>
- src/cmd/link/internal/mips64/obj.go | 2 +-<br>
- src/cmd/link/internal/ppc64/obj.go | 2 +-<br>
- src/cmd/link/internal/s390x/obj.go | 2 +-<br>
- src/cmd/link/internal/x86/obj.go | 2 +-<br>
- 8 files changed, 8 insertions(+), 8 deletions(-)<br>
-<br>
---- a/src/cmd/link/internal/amd64/obj.go<br>
-+++ b/src/cmd/link/internal/amd64/obj.go<br>
-@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- PEreloc1: pereloc1,<br>
- TLSIEtoLE: tlsIEtoLE,<br>
- <br>
-- Linuxdynld: "/lib64/ld-linux-x86-64.so.2",<br>
-+ Linuxdynld: "/lib64/ld-musl-x86-64.so.1",<br>
- Freebsddynld: "/libexec/ld-elf.so.1",<br>
- Openbsddynld: "/usr/libexec/ld.so",<br>
- Netbsddynld: "/libexec/ld.elf_so",<br>
---- a/src/cmd/link/internal/arm/obj.go<br>
-+++ b/src/cmd/link/internal/arm/obj.go<br>
-@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- Machoreloc1: machoreloc1,<br>
- PEreloc1: pereloc1,<br>
- <br>
-- Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI<br>
-+ Linuxdynld: "/lib/ld-musl-armhf.so.1",<br>
- Freebsddynld: "/usr/libexec/ld-elf.so.1",<br>
- Openbsddynld: "/usr/libexec/ld.so",<br>
- Netbsddynld: "/libexec/ld.elf_so",<br>
---- a/src/cmd/link/internal/arm64/obj.go<br>
-+++ b/src/cmd/link/internal/arm64/obj.go<br>
-@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- Gentext: gentext,<br>
- Machoreloc1: machoreloc1,<br>
- <br>
-- Linuxdynld: "/lib/ld-linux-aarch64.so.1",<br>
-+ Linuxdynld: "/lib/ld-musl-aarch64.so.1",<br>
- <br>
- Freebsddynld: "XXX",<br>
- Openbsddynld: "XXX",<br>
---- a/src/cmd/link/internal/mips/obj.go<br>
-+++ b/src/cmd/link/internal/mips/obj.go<br>
-@@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- Gentext: gentext,<br>
- Machoreloc1: machoreloc1,<br>
- <br>
-- Linuxdynld: "/lib/ld.so.1",<br>
-+ Linuxdynld: "/lib/ld-musl-mipsle.so.1",<br>
- <br>
- Freebsddynld: "XXX",<br>
- Openbsddynld: "XXX",<br>
---- a/src/cmd/link/internal/mips64/obj.go<br>
-+++ b/src/cmd/link/internal/mips64/obj.go<br>
-@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- Gentext: gentext,<br>
- Machoreloc1: machoreloc1,<br>
- <br>
-- Linuxdynld: "/lib64/ld64.so.1",<br>
-+ Linuxdynld: "/lib64/ld-musl-mips64le.so.1",<br>
- Freebsddynld: "XXX",<br>
- Openbsddynld: "XXX",<br>
- Netbsddynld: "XXX",<br>
---- a/src/cmd/link/internal/ppc64/obj.go<br>
-+++ b/src/cmd/link/internal/ppc64/obj.go<br>
-@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- Machoreloc1: machoreloc1,<br>
- <br>
- // TODO(austin): ABI v1 uses /usr/lib/ld.so.1,<br>
-- Linuxdynld: "/lib64/ld64.so.1",<br>
-+ Linuxdynld: "/lib64/ld-musl-powerpc64le.so.1",<br>
- <br>
- Freebsddynld: "XXX",<br>
- Openbsddynld: "XXX",<br>
---- a/src/cmd/link/internal/s390x/obj.go<br>
-+++ b/src/cmd/link/internal/s390x/obj.go<br>
-@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- Gentext: gentext,<br>
- Machoreloc1: machoreloc1,<br>
- <br>
-- Linuxdynld: "/lib64/ld64.so.1",<br>
-+ Linuxdynld: "/lib64/ld-musl-s390x.so.1",<br>
- <br>
- // not relevant for s390x<br>
- Freebsddynld: "XXX",<br>
---- a/src/cmd/link/internal/x86/obj.go<br>
-+++ b/src/cmd/link/internal/x86/obj.go<br>
-@@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
- Machoreloc1: machoreloc1,<br>
- PEreloc1: pereloc1,<br>
- <br>
-- Linuxdynld: "/lib/ld-linux.so.2",<br>
-+ Linuxdynld: "/lib/ld-musl-i386.so.1",<br>
- Freebsddynld: "/usr/libexec/ld-elf.so.1",<br>
- Openbsddynld: "/usr/libexec/ld.so",<br>
- Netbsddynld: "/usr/libexec/ld.elf_so",<br>
diff --git a/meta/recipes-devtools/go/<a href="http://go-cross-canadian_1.12.bb" rel="noreferrer" target="_blank">go-cross-canadian_1.12.bb</a> b/meta/recipes-devtools/go/<a href="http://go-cross-canadian_1.12.bb" rel="noreferrer" target="_blank">go-cross-canadian_1.12.bb</a><br>
deleted file mode 100644<br>
index 7ac9449e47..0000000000<br>
--- a/meta/recipes-devtools/go/<a href="http://go-cross-canadian_1.12.bb" rel="noreferrer" target="_blank">go-cross-canadian_1.12.bb</a><br>
+++ /dev/null<br>
@@ -1,2 +0,0 @@<br>
-require go-cross-canadian.inc<br>
-require go-${PV}.inc<br>
diff --git a/meta/recipes-devtools/go/<a href="http://go-cross_1.12.bb" rel="noreferrer" target="_blank">go-cross_1.12.bb</a> b/meta/recipes-devtools/go/<a href="http://go-cross_1.12.bb" rel="noreferrer" target="_blank">go-cross_1.12.bb</a><br>
deleted file mode 100644<br>
index 80b5a03f6c..0000000000<br>
--- a/meta/recipes-devtools/go/<a href="http://go-cross_1.12.bb" rel="noreferrer" target="_blank">go-cross_1.12.bb</a><br>
+++ /dev/null<br>
@@ -1,2 +0,0 @@<br>
-require go-cross.inc<br>
-require go-${PV}.inc<br>
diff --git a/meta/recipes-devtools/go/<a href="http://go-crosssdk_1.12.bb" rel="noreferrer" target="_blank">go-crosssdk_1.12.bb</a> b/meta/recipes-devtools/go/<a href="http://go-crosssdk_1.12.bb" rel="noreferrer" target="_blank">go-crosssdk_1.12.bb</a><br>
deleted file mode 100644<br>
index 1857c8a577..0000000000<br>
--- a/meta/recipes-devtools/go/<a href="http://go-crosssdk_1.12.bb" rel="noreferrer" target="_blank">go-crosssdk_1.12.bb</a><br>
+++ /dev/null<br>
@@ -1,2 +0,0 @@<br>
-require go-crosssdk.inc<br>
-require go-${PV}.inc<br>
diff --git a/meta/recipes-devtools/go/<a href="http://go-native_1.12.bb" rel="noreferrer" target="_blank">go-native_1.12.bb</a> b/meta/recipes-devtools/go/<a href="http://go-native_1.12.bb" rel="noreferrer" target="_blank">go-native_1.12.bb</a><br>
deleted file mode 100644<br>
index bbf3c0dd73..0000000000<br>
--- a/meta/recipes-devtools/go/<a href="http://go-native_1.12.bb" rel="noreferrer" target="_blank">go-native_1.12.bb</a><br>
+++ /dev/null<br>
@@ -1,2 +0,0 @@<br>
-require ${PN}.inc<br>
-require go-${PV}.inc<br>
diff --git a/meta/recipes-devtools/go/<a href="http://go-runtime_1.12.bb" rel="noreferrer" target="_blank">go-runtime_1.12.bb</a> b/meta/recipes-devtools/go/<a href="http://go-runtime_1.12.bb" rel="noreferrer" target="_blank">go-runtime_1.12.bb</a><br>
deleted file mode 100644<br>
index 43b68b4e46..0000000000<br>
--- a/meta/recipes-devtools/go/<a href="http://go-runtime_1.12.bb" rel="noreferrer" target="_blank">go-runtime_1.12.bb</a><br>
+++ /dev/null<br>
@@ -1,2 +0,0 @@<br>
-require go-${PV}.inc<br>
-require go-runtime.inc<br>
diff --git a/meta/recipes-devtools/go/<a href="http://go_1.12.bb" rel="noreferrer" target="_blank">go_1.12.bb</a> b/meta/recipes-devtools/go/<a href="http://go_1.12.bb" rel="noreferrer" target="_blank">go_1.12.bb</a><br>
deleted file mode 100644<br>
index 42cdb0430a..0000000000<br>
--- a/meta/recipes-devtools/go/<a href="http://go_1.12.bb" rel="noreferrer" target="_blank">go_1.12.bb</a><br>
+++ /dev/null<br>
@@ -1,14 +0,0 @@<br>
-require go-${PV}.inc<br>
-require go-target.inc<br>
-<br>
-export GOBUILDMODE=""<br>
-<br>
-# Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but mips<br>
-# doesn't support -buildmode=pie, so skip the QA checking for mips and its<br>
-# variants.<br>
-python() {<br>
- if 'mips' in d.getVar('TARGET_ARCH'):<br>
- d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel")<br>
- else:<br>
- d.setVar('GOBUILDMODE', 'pie')<br>
-}<br>
-- <br>
2.17.1 (Apple Git-112)<br>
<br>
</blockquote></div>