Skip to content

Commit

Permalink
Bump go to 1.12.16
Browse files Browse the repository at this point in the history
Pulls in the changes from yocto zeus and bumps that from 1.12.9 to
1.12.16 to get recent security patches.

Signed-off-by: Robert Günzler <robertg@balena.io>
  • Loading branch information
robertgzr committed Feb 11, 2020
1 parent a97262f commit d5424cd
Show file tree
Hide file tree
Showing 30 changed files with 547 additions and 534 deletions.
2 changes: 1 addition & 1 deletion meta-balena-common/conf/distro/include/balena-os.inc
Expand Up @@ -91,4 +91,4 @@ PREFERRED_VERSION_upx_arm = "3.94"
PREFERRED_VERSION_upx-native_arm = "3.94"

# balena-engine go version requirement
GOVERSION = "1.10.8"
GOVERSION = "1.12.12"

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,7 +1,7 @@
require go-common.inc

GO_BASEVERSION = "1.10"
GO_MINOR = ".8"
GO_BASEVERSION = "1.12"
GO_MINOR = ".16"
PV .= "${GO_MINOR}"
FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"

Expand All @@ -15,9 +15,9 @@ SRC_URI += "\
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] = "1a5f93f2aa6e894dbd4bed2cf88f71f2"
SRC_URI[main.sha256sum] = "6faf74046b5e24c2c0b46e78571cca4d65e1b89819da1089e53ea57539c63491"
SRC_URI[main.md5sum] = "a6fedef52f405335481090a288ec5121"
SRC_URI[main.sha256sum] = "ce6e5ed85b4a54ffc01d55a5838ee313acb4a7f109a745440fecbead1d081df8"
@@ -0,0 +1,31 @@
From 7cc519aa5f84cf8fc7ac8c10fc69aa8040330ea0 Mon Sep 17 00:00:00 2001
From: Matt Madison <matt@madison.systems>
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 <matt@madison.systems>

---
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})

0 comments on commit d5424cd

Please sign in to comment.