Skip to contentSkip to conversation

Remove Go 1.11

PATCH New Adrian Bunk 1 participant 1 message May 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remove Go 1.11

There doesn't seem to be a reason to keep it in addition to 1.12 now.

---
 meta/recipes-devtools/go/go-1.11.inc          |  23 --
 ...ow-CC-and-CXX-to-have-multiple-words.patch |  31 --
 ...ent-based-hash-generation-less-pedan.patch | 218 --------------
 ...-to-be-overridden-in-the-environment.patch |  48 ---
 ...4-ld-add-soname-to-shareable-objects.patch |  45 ---
 ...de-CC-when-building-dist-and-go_boot.patch |  37 ---
 ...dist-separate-host-and-target-builds.patch | 282 ------------------
 ...d-go-make-GOROOT-precious-by-default.patch | 106 -------
 ...008-use-GOBUILDMODE-to-set-buildmode.patch |  37 ---
 ...place-glibc-dynamic-linker-with-musl.patch | 128 --------
 .../go/go-cross-canadian_1.11.bb              |   2 -
 meta/recipes-devtools/go/go-cross_1.11.bb     |   2 -
 meta/recipes-devtools/go/go-crosssdk_1.11.bb  |   2 -
 meta/recipes-devtools/go/go-native_1.11.bb    |   2 -
 meta/recipes-devtools/go/go-runtime_1.11.bb   |   2 -
 meta/recipes-devtools/go/go_1.11.bb           |  14 -
 16 files changed, 979 deletions(-)
 delete mode 100644 meta/recipes-devtools/go/go-1.11.inc
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0004-ld-add-soname-to-shareable-objects.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0006-cmd-dist-separate-host-and-target-builds.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch
 delete mode 100644 meta/recipes-devtools/go/go-1.11/0009-ld-replace-glibc-dynamic-linker-with-musl.patch
 delete mode 100644 meta/recipes-devtools/go/go-cross-canadian_1.11.bb
 delete mode 100644 meta/recipes-devtools/go/go-cross_1.11.bb
 delete mode 100644 meta/recipes-devtools/go/go-crosssdk_1.11.bb
 delete mode 100644 meta/recipes-devtools/go/go-native_1.11.bb
 delete mode 100644 meta/recipes-devtools/go/go-runtime_1.11.bb
 delete mode 100644 meta/recipes-devtools/go/go_1.11.bb
meta/recipes-devtools/go/go-1.11.inc deleted +0 -23
deleted file mode 100644
index d03e26cea0..0000000000
@@ -1,23 +0,0 @@
-require go-common.inc
-
-GO_BASEVERSION = "1.11"
-GO_MINOR = ".4"
-PV .= "${GO_MINOR}"
-FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
-
-SRC_URI += "\
-    file://0001-allow-CC-and-CXX-to-have-multiple-words.patch \
-    file://0002-cmd-go-make-content-based-hash-generation-less-pedan.patch \
-    file://0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch \
-    file://0004-ld-add-soname-to-shareable-objects.patch \
-    file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \
-    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 \
-"
-SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
-
-SRC_URI[main.md5sum] = "a77697673215be465d1b583680ef2318"
-SRC_URI[main.sha256sum] = "4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15"
meta/recipes-devtools/go/go-1.11/0001-allow-CC-and-CXX-to-have-multiple-words.patch deleted +0 -31
deleted file mode 100644
index 4442858c83..0000000000
@@ -1,31 +0,0 @@
-From 7cc519aa5f84cf8fc7ac8c10fc69aa8040330ea0 Mon Sep 17 00:00:00 2001
-From: Matt Madison <[email protected]>
-Date: Mon, 19 Feb 2018 08:49:33 -0800
-Subject: [PATCH] allow CC and CXX to have multiple words
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <[email protected]>
-
----
- src/cmd/go/internal/envcmd/env.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
-index afadbad..cedbfbf 100644
---- a/src/cmd/go/internal/envcmd/env.go
-+++ b/src/cmd/go/internal/envcmd/env.go
-@@ -85,11 +85,11 @@ func MkEnv() []cfg.EnvVar {
- 
- 	cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch)
- 	if env := strings.Fields(os.Getenv("CC")); len(env) > 0 {
--		cc = env[0]
-+		cc = strings.Join(env, " ")
- 	}
- 	cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch)
- 	if env := strings.Fields(os.Getenv("CXX")); len(env) > 0 {
--		cxx = env[0]
-+		cxx = strings.Join(env, " ")
- 	}
- 	env = append(env, cfg.EnvVar{Name: "CC", Value: cc})
- 	env = append(env, cfg.EnvVar{Name: "CXX", Value: cxx})
meta/recipes-devtools/go/go-1.11/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch deleted +0 -218

218 lines not on this page · raw message

meta/recipes-devtools/go/go-1.11/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch deleted +0 -48

48 lines not on this page · raw message

meta/recipes-devtools/go/go-1.11/0004-ld-add-soname-to-shareable-objects.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-devtools/go/go-1.11/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch deleted +0 -37
deleted file mode 100644
index ace8de9eae..0000000000
@@ -1,37 +0,0 @@
-From 1bf15aa8fb773604b2524cfdab493fa4d8fa9285 Mon Sep 17 00:00:00 2001
-From: Matt Madison <[email protected]>
-Date: Sat, 17 Feb 2018 06:32:45 -0800
-Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap
-
-for handling OE cross-canadian builds.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <[email protected]>
-
----
- src/make.bash | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/make.bash b/src/make.bash
-index 78882d9..25943d0 100755
---- a/src/make.bash
-+++ b/src/make.bash
-@@ -163,7 +163,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then
- 	exit 1
- fi
- rm -f cmd/dist/dist
--GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
-+CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
- 
- # -e doesn't propagate out of eval, so check success by hand.
- eval $(./cmd/dist/dist env -p || echo FAIL=true)
-@@ -194,7 +194,7 @@ fi
- # Run dist bootstrap to complete make.bash.
- # Bootstrap installs a proper cmd/dist, built with the new toolchain.
- # Throw ours, built with Go 1.4, away after bootstrap.
--./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"
-+CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"
- rm -f ./cmd/dist/dist
- 
- # DO NOT ADD ANY NEW CODE HERE.
meta/recipes-devtools/go/go-1.11/0006-cmd-dist-separate-host-and-target-builds.patch deleted +0 -282

282 lines not on this page · raw message

meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch deleted +0 -106

106 lines not on this page · raw message

meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch deleted +0 -37
deleted file mode 100644
index 225cf439c5..0000000000
@@ -1,37 +0,0 @@
-From 0e0c247f0caec23528889ff09d98348cba9028f1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <[email protected]>
-Date: Fri, 26 Oct 2018 15:02:32 +0800
-Subject: [PATCH] use GOBUILDMODE to set buildmode
-
-While building go itself, the go build system does not support
-to set `-buildmode=pie' from environment.
-
-Add GOBUILDMODE to support it which make PIE executables the default
-build mode, as PIE executables are required as of Yocto
-
-Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI
-Upstream-Status: Denied [upstream choose antoher solution: `17a256b
-cmd/go: -buildmode=pie for android/arm']
-
-Signed-off-by: Hongxu Jia <[email protected]>
----
- src/cmd/go/internal/work/build.go | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: go/src/cmd/go/internal/work/build.go
-===================================================================
---- go.orig/src/cmd/go/internal/work/build.go
-+++ go/src/cmd/go/internal/work/build.go
-@@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) {
- 
- 	cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "")
- 	cmd.Flag.Var(buildCompiler{}, "compiler", "")
--	cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")
-+	if bm := os.Getenv("GOBUILDMODE"); bm != "" {
-+		cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", bm, "")
-+	} else {
-+		cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")
-+	}
- 	cmd.Flag.Var(&load.BuildGcflags, "gcflags", "")
- 	cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "")
- 	cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "")
meta/recipes-devtools/go/go-1.11/0009-ld-replace-glibc-dynamic-linker-with-musl.patch deleted +0 -128

128 lines not on this page · raw message

meta/recipes-devtools/go/go-cross-canadian_1.11.bb deleted +0 -2
deleted file mode 100644
index 7ac9449e47..0000000000
@@ -1,2 +0,0 @@
-require go-cross-canadian.inc
-require go-${PV}.inc
meta/recipes-devtools/go/go-cross_1.11.bb deleted +0 -2
deleted file mode 100644
index 80b5a03f6c..0000000000
@@ -1,2 +0,0 @@
-require go-cross.inc
-require go-${PV}.inc
meta/recipes-devtools/go/go-crosssdk_1.11.bb deleted +0 -2
deleted file mode 100644
index 1857c8a577..0000000000
@@ -1,2 +0,0 @@
-require go-crosssdk.inc
-require go-${PV}.inc
meta/recipes-devtools/go/go-native_1.11.bb deleted +0 -2
deleted file mode 100644
index bbf3c0dd73..0000000000
@@ -1,2 +0,0 @@
-require ${PN}.inc
-require go-${PV}.inc
meta/recipes-devtools/go/go-runtime_1.11.bb deleted +0 -2
deleted file mode 100644
index 43b68b4e46..0000000000
@@ -1,2 +0,0 @@
-require go-${PV}.inc
-require go-runtime.inc
meta/recipes-devtools/go/go_1.11.bb deleted +0 -14
deleted file mode 100644
index 42cdb0430a..0000000000
@@ -1,14 +0,0 @@
-require go-${PV}.inc
-require go-target.inc
-
-export GOBUILDMODE=""
-
-# Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but mips
-# doesn't support -buildmode=pie, so skip the QA checking for mips and its
-# variants.
-python() {
-    if 'mips' in d.getVar('TARGET_ARCH'):
-        d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel")
-    else:
-        d.setVar('GOBUILDMODE', 'pie')
-}
Signature · 1 line
2.17.1