Skip to contentSkip to conversation

go: Update to 1.15.5

PATCH Superseded Khem Raj 2 participants 4 messages Nov 20, 2020 1 message not in the archive

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 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

Disable CGO_LDFLAGS for go-runtime since it confuses the linker

Fixes
| Building std for target, linux/arm.
| go build runtime/cgo: invalid flag in go:cgo_ldflag: -Wl,-O1

---
v2: Fix go-runtime build

 meta/recipes-devtools/go/go-1.15.inc                          | 4 ++--
 ...{go-binary-native_1.15.3.bb => go-binary-native_1.15.5.bb} | 4 ++--
 meta/recipes-devtools/go/go-runtime.inc                       | 1 -
 meta/recipes-devtools/go/go_1.15.bb                           | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/go/{go-binary-native_1.15.3.bb => go-binary-native_1.15.5.bb} (83%)
meta/recipes-devtools/go/go-1.15.inc +2 -2
index a35921c1f8..31e68d14ee 100644
@@ -1,7 +1,7 @@
 require go-common.inc
 
 GO_BASEVERSION = "1.15"
-PV = "1.15.3"
+PV = "1.15.5"
 FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
@@ -16,4 +16,4 @@ SRC_URI += "\
     file://0007-cmd-go-make-GOROOT-precious-by-default.patch \
     file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
 "
-SRC_URI[main.sha256sum] = "896a602570e54c8cdfc2c1348abd4ffd1016758d0bd086ccd9787dbfc9b64888"
+SRC_URI[main.sha256sum] = "c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1"
meta/recipes-devtools/go/go-binary-native_1.15.5.bb renamed from meta/recipes-devtools/go/go-binary-native_1.15.3.bb +2 -2
similarity index 83%
rename from meta/recipes-devtools/go/go-binary-native_1.15.3.bb
rename to meta/recipes-devtools/go/go-binary-native_1.15.5.bb
index aeab91a80f..1fb11b0435 100644
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
 PROVIDES = "go-native"
 
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d"
-SRC_URI[go_linux_arm64.sha256sum] = "b8b88a87ada918ef5189fa5938ef4c46a4f61952a34317612aaac705f4275f80"
+SRC_URI[go_linux_amd64.sha256sum] = "9a58494e8da722c3aef248c9227b0e9c528c7318309827780f16220998180a0d"
+SRC_URI[go_linux_arm64.sha256sum] = "a72a0b036beb4193a0214bca3fca4c5d68a38a4ccf098c909f7ce8bf08567c48"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-runtime.inc +0 -1
index 21179a83a0..37a8c95203 100644
@@ -5,7 +5,6 @@ PROVIDES = "virtual/${TARGET_PREFIX}go-runtime"
 export CGO_CFLAGS = "${CFLAGS}"
 export CGO_CPPFLAGS = "${CPPFLAGS}"
 export CGO_CXXFLAGS = "${CXXFLAGS}"
-export CGO_LDFLAGS = "${LDFLAGS}"
 export GOCACHE = "${B}/.cache"
 
 GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}"
meta/recipes-devtools/go/go_1.15.bb +2 -0
index cc4c3fe45d..d4812c0f0a 100644
@@ -6,6 +6,8 @@ inherit linuxloader
 export GOBUILDMODE=""
 export CGO_ENABLED_riscv64 = ""
 export GO_LDSO = "${@get_linuxloader(d)}"
+export CC_FOR_TARGET = "gcc"
+export CXX_FOR_TARGET = "g++"
 
 # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv and its
 # variants.
Signature · 1 line
2.29.2
#1 lore raw
Quoted 6 lines · Khem Raj

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

Disable CGO_LDFLAGS for go-runtime since it confuses the linker

Quoted 7 lines

Fixes

Quoted 2 lines

Building std for target, linux/arm.
go build runtime/cgo: invalid flag in go:cgo_ldflag: -Wl,-O1

---
v2: Fix go-runtime build

Various failures in world builds:

musl x86:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/2728
musl x86-64:
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/2731
no-x11:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2729

Cheers,

Richard

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 15 lines · Richard Purdie via lists.openembedded.org
Quoted 6 lines · Khem Raj

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

Disable CGO_LDFLAGS for go-runtime since it confuses the linker

Quoted 7 lines

Fixes

Quoted 2 lines

Building std for target, linux/arm.
go build runtime/cgo: invalid flag in go:cgo_ldflag: -Wl,-O1

---
v2: Fix go-runtime build

Quoted 8 lines

Various failures in world builds:

musl x86:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/2728
musl x86-64:
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/2731
no-x11:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2729

and selftests:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1582

Cheers,

Richard

author
#4 lore raw
Quoted 27 lines · Richard Purdie
Quoted 15 lines · Richard Purdie via lists.openembedded.org
Quoted 6 lines · Khem Raj

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

Disable CGO_LDFLAGS for go-runtime since it confuses the linker

Quoted 7 lines

Fixes

Quoted 2 lines

Building std for target, linux/arm.
go build runtime/cgo: invalid flag in go:cgo_ldflag: -Wl,-O1

---
v2: Fix go-runtime build

Quoted 8 lines

Various failures in world builds:

musl x86:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/2728
musl x86-64:
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/2731
no-x11:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2729

Quoted 5 lines

and selftests:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1582

Cheers,

thanks I can see some of it locally too. will deep dive there is something quirky with CGO flags

Quoted 3 lines

Richard