From d21978d33dfcf61d98079031b71cdfe70e584097 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Wed, 28 Feb 2024 18:30:09 +0000 Subject: go: upgrade 1.21.0 -> 1.21.5 Upgrade to latest 1.21.x release [1]: $ git --no-pager log --oneline go1.21.0..go1.21.5 6018ad99a4 (tag: go1.21.5) [release-branch.go1.21] go1.21.5 ec8c526e4b [release-branch.go1.21] net/http: limit chunked data overhead f7a79cb5fc [release-branch.go1.21] cmd/compile: fix findIndVar so it does not match disjointed loop headers 3684d19c20 [release-branch.go1.21] runtime: call enableMetadataHugePages and its callees on the systemstack 9e43850a32 [release-branch.go1.21] crypto/rand,runtime: switch RtlGenRandom for ProcessPrng 8caf4bb3e7 [release-branch.go1.21] path/filepath: consider \\?\c: as a volume on Windows 23c943e529 [release-branch.go1.21] cmd/go/internal/vcs: error out if the requested repo does not support a secure protocol 4952f41180 [release-branch.go1.21] cmd/go: allow 'go mod download' to switch toolchains if called with explicit arguments f26fa05522 [release-branch.go1.21] os: report IO_REPARSE_TAG_DEDUP files as regular in Stat and Lstat 8ae493b5b8 [release-branch.go1.21] internal/poll: add SPLICE_F_NONBLOCK flag for splice to avoid inconsistency with O_NONBLOCK b9f245b8d3 [release-branch.go1.21] cmd/compile: ensure pointer arithmetic happens after the nil check caacf3a09a [release-branch.go1.21] cmd/compile: handle constant pointer offsets in dead store elimination 1e91861f67 [release-branch.go1.21] syscall: copy rlimit.go's build constraint to rlimit_test.go ed817f1c40 (tag: go1.21.4) [release-branch.go1.21] go1.21.4 9e933c189c [release-branch.go1.21] path/filepath: fix various issues in parsing Windows paths 434af8537e [release-branch.go1.21] net/http: pull http2 underflow fix from x/net/http2 7b04d81cbc [release-branch.go1.21] runtime/cgo: avoid taking the address of crosscall2 in code f9a31cda3c [release-branch.go1.21] cmd/compile/internal/typecheck: fix closure field naming 64b6c48107 [release-branch.go1.21] go/types, types2: don't use generics ef6993f327 [release-branch.go1.21] runtime: don't eagerly collapse hugepages bae01521f3 [release-branch.go1.21] go/types, types2: don't implicitly modify an argument function's type 236c07c049 [release-branch.go1.21] cmd/link: split text sections for arm 32-bit 9465990e0e [release-branch.go1.21] all: tidy dependency versioning after release 883f062fc0 (tag: go1.21.3) [release-branch.go1.21] go1.21.3 24ae2d9272 [release-branch.go1.21] net/http: regenerate h2_bundle.go 26b5783b72 (tag: go1.21.2) [release-branch.go1.21] go1.21.2 2ddfc04d12 [release-branch.go1.21] cmd/compile: use absolute file name in isCgo check a15ef1bb0f [release-branch.go1.21] cmd/compile: absorb InvertFlags into Noov comparisons 41d71a5afa [release-branch.go1.21] cmd/compile: reset memcombine correctly between basic blocks 0b6b0a275a [release-branch.go1.21] runtime: always lock OS thread in debugcall cd671a1180 [release-branch.go1.21] runtime: increase g0 stack size in non-cgo case fc57cc31a0 [release-branch.go1.21] cmd/link: suppress -bind_at_load deprecation warning for ld-prime 9bec49cf52 [release-branch.go1.21] cmd/link: disable DWARF by default in c-shared mode on darwin 3ef4f939c3 [release-branch.go1.21] cmd/link: force old Apple linker in plugin mode 556e9c36ba [release-branch.go1.21] cmd/link: avoid deadcode of global map vars for programs using plugins b64dc5f499 [release-branch.go1.21] cmd/go: in TestScript/gotoolchain_path, remove the user's PATH cd66ca0636 [release-branch.go1.21] runtime/metrics: fix /gc/scan/* metrics d7a0626806 [release-branch.go1.21] runtime: ignore SPWrite on innermost traceback frame 2c1e5b05fe (tag: go1.21.1) [release-branch.go1.21] go1.21.1 bbd043ff0d [release-branch.go1.21] html/template: properly handle special tags within the script context b0e1d3ea26 [release-branch.go1.21] html/template: support HTML-like comments in script contexts d25a935574 [release-branch.go1.21] cmd/go: reject toolchain directives containing path separators e3ba569c78 [release-branch.go1.21] net/http: revert "support streaming POST content in wasm" 8dc6ad1c61 [release-branch.go1.21] runtime: restore caller's frame pointer when recovering from panic 06df3292a8 [release-branch.go1.21] runtime: avoid MADV_HUGEPAGE for heap memory b120517ffd [release-branch.go1.21] go/types, types2: remove order dependency in inference involving channels 0a9582163c [release-branch.go1.21] cmd/go: retry ETXTBSY errors when running test binaries 91a4e74b98 [release-branch.go1.21] crypto/tls: QUIC: fix panics when processing post-handshake messages 6385a6fb18 [release-branch.go1.21] cmd/go: find GOROOT using os.Executable when installed to GOROOT/bin/GOOS_GOARCH 2d07bb86f0 [release-branch.go1.21] encoding/xml: overriding by empty namespace when no new name declaration 745b81b6e6 [release-branch.go1.21] encoding/gob: prevent panic from index out of range in Decoder.typeString 13339c75b8 [release-branch.go1.21] runtime: fix maps.Clone bug when cloning a map mid-grow 2977709875 [release-branch.go1.21] context: fix synchronization in ExampleAfterFunc_cond 2d4746f37b [release-branch.go1.21] go/types, types2: disable interface inference for versions before Go 1.21 2b8026f025 [release-branch.go1.21] cmd/compile: in expandCalls, move all arg marshalling into call block 7c97cc7d97 [release-branch.go1.21] Revert "os: use handle based APIs to read directories on windows" cb6ea94996 [release-branch.go1.21] Revert "cmd/compile: omit redundant sign/unsign extension on arm64" 45b98bfb79 [release-branch.go1.21] path/filepath: don't drop .. elements when cleaning invalid Windows paths bac083a584 [release-branch.go1.21] cmd/link: don't mangle string symbol names 70aa116c4a [release-branch.go1.21] runtime/internal/wasitest: skip racy TCP echo test 31c5a236bc [release-branch.go1.21] runtime: mark traceEnabled and traceShuttingDown as no:split 25ec110e51 [release-branch.go1.21] cmd/compile: ensure empty blocks in write barriers are marked unpreemptible 6634ce2f41 [release-branch.go1.21] runtime: profiling on Darwin cannot use blocking reads 25c6dce188 [release-branch.go1.21] cmd/compile: make backingArrayPtrLen to return typecheck-ed nodes 4e34f2e81d [release-branch.go1.21] go/types, types2: don't panic during interface completion d91843ff67 [release-branch.go1.21] go/types, types2: use correct parameter list when checking argument passing 7437db1085 [release-branch.go1.21] go/types, types2: use exact unification when comparing interface methods ed527ecfb2 [release-branch.go1.21] cmd/api: rename api.go to main_test.go b78e8cc145 [release-branch.go1.21] crypto/tls: add GODEBUG to control max RSA key size 3475e6af4c [release-branch.go1.21] cmd/go: fix missing case checking for empty slice 179821c9e1 [release-branch.go1.21] net/http: permit requests with invalid Host headers 9398951479 [release-branch.go1.21] cmd/distpack: include directory entries in tar files 75d8be5fb4 [release-branch.go1.21] cmd/go/internal/web: release the net token when an HTTP request fails due to CheckRedirect 1755d14559 [release-branch.go1.21] cmd/compile: fix missing init nodes for len(string([]byte)) optimization [1] https://github.com/golang/go/compare/go1.21.0...go1.21.5 (From OE-Core rev: 0e0a939b0fa124618b963e9af7a11cea3748ef82) Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie --- meta/recipes-devtools/go/go-1.21.0.inc | 18 ------- meta/recipes-devtools/go/go-1.21.5.inc | 18 +++++++ .../recipes-devtools/go/go-binary-native_1.21.0.bb | 50 ------------------- .../recipes-devtools/go/go-binary-native_1.21.5.bb | 50 +++++++++++++++++++ .../go/go-cross-canadian_1.21.0.bb | 2 - .../go/go-cross-canadian_1.21.5.bb | 2 + meta/recipes-devtools/go/go-cross_1.21.0.bb | 2 - meta/recipes-devtools/go/go-cross_1.21.5.bb | 2 + meta/recipes-devtools/go/go-crosssdk_1.21.0.bb | 2 - meta/recipes-devtools/go/go-crosssdk_1.21.5.bb | 2 + meta/recipes-devtools/go/go-native_1.21.0.bb | 58 ---------------------- meta/recipes-devtools/go/go-native_1.21.5.bb | 58 ++++++++++++++++++++++ meta/recipes-devtools/go/go-runtime_1.21.0.bb | 3 -- meta/recipes-devtools/go/go-runtime_1.21.5.bb | 3 ++ meta/recipes-devtools/go/go_1.21.0.bb | 18 ------- meta/recipes-devtools/go/go_1.21.5.bb | 18 +++++++ 16 files changed, 153 insertions(+), 153 deletions(-) delete mode 100644 meta/recipes-devtools/go/go-1.21.0.inc create mode 100644 meta/recipes-devtools/go/go-1.21.5.inc delete mode 100644 meta/recipes-devtools/go/go-binary-native_1.21.0.bb create mode 100644 meta/recipes-devtools/go/go-binary-native_1.21.5.bb delete mode 100644 meta/recipes-devtools/go/go-cross-canadian_1.21.0.bb create mode 100644 meta/recipes-devtools/go/go-cross-canadian_1.21.5.bb delete mode 100644 meta/recipes-devtools/go/go-cross_1.21.0.bb create mode 100644 meta/recipes-devtools/go/go-cross_1.21.5.bb delete mode 100644 meta/recipes-devtools/go/go-crosssdk_1.21.0.bb create mode 100644 meta/recipes-devtools/go/go-crosssdk_1.21.5.bb delete mode 100644 meta/recipes-devtools/go/go-native_1.21.0.bb create mode 100644 meta/recipes-devtools/go/go-native_1.21.5.bb delete mode 100644 meta/recipes-devtools/go/go-runtime_1.21.0.bb create mode 100644 meta/recipes-devtools/go/go-runtime_1.21.5.bb delete mode 100644 meta/recipes-devtools/go/go_1.21.0.bb create mode 100644 meta/recipes-devtools/go/go_1.21.5.bb diff --git a/meta/recipes-devtools/go/go-1.21.0.inc b/meta/recipes-devtools/go/go-1.21.0.inc deleted file mode 100644 index 2933793b8b..0000000000 --- a/meta/recipes-devtools/go/go-1.21.0.inc +++ /dev/null @@ -1,18 +0,0 @@ -require go-common.inc - -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" - -SRC_URI += "\ - file://0001-cmd-go-make-content-based-hash-generation-less-pedan.patch \ - file://0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch \ - file://0003-ld-add-soname-to-shareable-objects.patch \ - file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \ - file://0005-cmd-dist-separate-host-and-target-builds.patch \ - file://0006-cmd-go-make-GOROOT-precious-by-default.patch \ - file://0007-exec.go-do-not-write-linker-flags-into-buildids.patch \ - file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ - file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ -" -SRC_URI[main.sha256sum] = "818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a" diff --git a/meta/recipes-devtools/go/go-1.21.5.inc b/meta/recipes-devtools/go/go-1.21.5.inc new file mode 100644 index 0000000000..f009ea77c7 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.21.5.inc @@ -0,0 +1,18 @@ +require go-common.inc + +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go:" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" + +SRC_URI += "\ + file://0001-cmd-go-make-content-based-hash-generation-less-pedan.patch \ + file://0002-cmd-go-Allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch \ + file://0003-ld-add-soname-to-shareable-objects.patch \ + file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \ + file://0005-cmd-dist-separate-host-and-target-builds.patch \ + file://0006-cmd-go-make-GOROOT-precious-by-default.patch \ + file://0007-exec.go-do-not-write-linker-flags-into-buildids.patch \ + file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ + file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ +" +SRC_URI[main.sha256sum] = "285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19" diff --git a/meta/recipes-devtools/go/go-binary-native_1.21.0.bb b/meta/recipes-devtools/go/go-binary-native_1.21.0.bb deleted file mode 100644 index 5d0427f56f..0000000000 --- a/meta/recipes-devtools/go/go-binary-native_1.21.0.bb +++ /dev/null @@ -1,50 +0,0 @@ -# This recipe is for bootstrapping our go-cross from a prebuilt binary of Go from golang.org. - -SUMMARY = "Go programming language compiler (upstream binary for bootstrap)" -HOMEPAGE = " http://golang.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" - -PROVIDES = "go-native" - -# Checksums available at https://go.dev/dl/ -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] = "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742" -SRC_URI[go_linux_arm64.sha256sum] = "f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3" -SRC_URI[go_linux_ppc64le.sha256sum] = "e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f" - -UPSTREAM_CHECK_URI = "https://golang.org/dl/" -UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" - -CVE_PRODUCT = "golang:go" - -S = "${WORKDIR}/go" - -inherit goarch native - -do_compile() { - : -} - -make_wrapper() { - rm -f ${D}${bindir}/$1 - cat <${D}${bindir}/$1 -#!/bin/bash -here=\`dirname \$0\` -export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}" -\$here/../lib/go/bin/$1 "\$@" -END - chmod +x ${D}${bindir}/$1 -} - -do_install() { - find ${S} -depth -type d -name testdata -exec rm -rf {} + - - install -d ${D}${bindir} ${D}${libdir}/go - cp --preserve=mode,timestamps -R ${S}/ ${D}${libdir}/ - - for f in ${S}/bin/* - do - make_wrapper `basename $f` - done -} diff --git a/meta/recipes-devtools/go/go-binary-native_1.21.5.bb b/meta/recipes-devtools/go/go-binary-native_1.21.5.bb new file mode 100644 index 0000000000..da35c5703d --- /dev/null +++ b/meta/recipes-devtools/go/go-binary-native_1.21.5.bb @@ -0,0 +1,50 @@ +# This recipe is for bootstrapping our go-cross from a prebuilt binary of Go from golang.org. + +SUMMARY = "Go programming language compiler (upstream binary for bootstrap)" +HOMEPAGE = " http://golang.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" + +PROVIDES = "go-native" + +# Checksums available at https://go.dev/dl/ +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] = "e2bc0b3e4b64111ec117295c088bde5f00eeed1567999ff77bc859d7df70078e" +SRC_URI[go_linux_arm64.sha256sum] = "841cced7ecda9b2014f139f5bab5ae31785f35399f236b8b3e75dff2a2978d96" +SRC_URI[go_linux_ppc64le.sha256sum] = "907b8c6ec4be9b184952e5d3493be66b1746442394a8bc78556c56834cd7c38b" + +UPSTREAM_CHECK_URI = "https://golang.org/dl/" +UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" + +CVE_PRODUCT = "golang:go" + +S = "${WORKDIR}/go" + +inherit goarch native + +do_compile() { + : +} + +make_wrapper() { + rm -f ${D}${bindir}/$1 + cat <${D}${bindir}/$1 +#!/bin/bash +here=\`dirname \$0\` +export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}" +\$here/../lib/go/bin/$1 "\$@" +END + chmod +x ${D}${bindir}/$1 +} + +do_install() { + find ${S} -depth -type d -name testdata -exec rm -rf {} + + + install -d ${D}${bindir} ${D}${libdir}/go + cp --preserve=mode,timestamps -R ${S}/ ${D}${libdir}/ + + for f in ${S}/bin/* + do + make_wrapper `basename $f` + done +} diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.21.0.bb b/meta/recipes-devtools/go/go-cross-canadian_1.21.0.bb deleted file mode 100644 index 7ac9449e47..0000000000 --- a/meta/recipes-devtools/go/go-cross-canadian_1.21.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require go-cross-canadian.inc -require go-${PV}.inc diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.21.5.bb b/meta/recipes-devtools/go/go-cross-canadian_1.21.5.bb new file mode 100644 index 0000000000..7ac9449e47 --- /dev/null +++ b/meta/recipes-devtools/go/go-cross-canadian_1.21.5.bb @@ -0,0 +1,2 @@ +require go-cross-canadian.inc +require go-${PV}.inc diff --git a/meta/recipes-devtools/go/go-cross_1.21.0.bb b/meta/recipes-devtools/go/go-cross_1.21.0.bb deleted file mode 100644 index 80b5a03f6c..0000000000 --- a/meta/recipes-devtools/go/go-cross_1.21.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require go-cross.inc -require go-${PV}.inc diff --git a/meta/recipes-devtools/go/go-cross_1.21.5.bb b/meta/recipes-devtools/go/go-cross_1.21.5.bb new file mode 100644 index 0000000000..80b5a03f6c --- /dev/null +++ b/meta/recipes-devtools/go/go-cross_1.21.5.bb @@ -0,0 +1,2 @@ +require go-cross.inc +require go-${PV}.inc diff --git a/meta/recipes-devtools/go/go-crosssdk_1.21.0.bb b/meta/recipes-devtools/go/go-crosssdk_1.21.0.bb deleted file mode 100644 index 1857c8a577..0000000000 --- a/meta/recipes-devtools/go/go-crosssdk_1.21.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require go-crosssdk.inc -require go-${PV}.inc diff --git a/meta/recipes-devtools/go/go-crosssdk_1.21.5.bb b/meta/recipes-devtools/go/go-crosssdk_1.21.5.bb new file mode 100644 index 0000000000..1857c8a577 --- /dev/null +++ b/meta/recipes-devtools/go/go-crosssdk_1.21.5.bb @@ -0,0 +1,2 @@ +require go-crosssdk.inc +require go-${PV}.inc diff --git a/meta/recipes-devtools/go/go-native_1.21.0.bb b/meta/recipes-devtools/go/go-native_1.21.0.bb deleted file mode 100644 index ddf25b2c9b..0000000000 --- a/meta/recipes-devtools/go/go-native_1.21.0.bb +++ /dev/null @@ -1,58 +0,0 @@ -# This recipe builds a native Go (written in Go) by first building an old Go 1.4 -# (written in C). However this old Go does not support all hosts platforms. - -require go-${PV}.inc - -inherit native - -SRC_URI += "https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" -SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52" - -export GOOS = "${BUILD_GOOS}" -export GOARCH = "${BUILD_GOARCH}" -CC = "${@d.getVar('BUILD_CC').strip()}" - -GOMAKEARGS ?= "--no-banner" - -do_configure() { - cd ${WORKDIR}/go1.4/go/src - CGO_ENABLED=0 GOROOT=${WORKDIR}/go1.4/go ./make.bash -} - -do_compile() { - export GOROOT_FINAL="${libdir_native}/go" - export GOROOT_BOOTSTRAP="${WORKDIR}/go1.4/go" - - cd src - ./make.bash ${GOMAKEARGS} - cd ${B} -} -do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin" - -make_wrapper() { - rm -f ${D}${bindir}/$2$3 - cat <${D}${bindir}/$2$3 -#!/bin/bash -here=\`dirname \$0\` -export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}" -\$here/../lib/go/bin/$1 "\$@" -END - chmod +x ${D}${bindir}/$2 -} - -do_install() { - install -d ${D}${libdir}/go - cp --preserve=mode,timestamps -R ${B}/pkg ${D}${libdir}/go/ - install -d ${D}${libdir}/go/src - (cd ${S}/src; for d in *; do \ - [ -d $d ] && cp -a ${S}/src/$d ${D}${libdir}/go/src/; \ - done) - find ${D}${libdir}/go/src -depth -type d -name testdata -exec rm -rf {} \; - install -d ${D}${bindir} ${D}${libdir}/go/bin - for f in ${B}/bin/* - do - base=`basename $f` - install -m755 $f ${D}${libdir}/go/bin - make_wrapper $base $base - done -} diff --git a/meta/recipes-devtools/go/go-native_1.21.5.bb b/meta/recipes-devtools/go/go-native_1.21.5.bb new file mode 100644 index 0000000000..ddf25b2c9b --- /dev/null +++ b/meta/recipes-devtools/go/go-native_1.21.5.bb @@ -0,0 +1,58 @@ +# This recipe builds a native Go (written in Go) by first building an old Go 1.4 +# (written in C). However this old Go does not support all hosts platforms. + +require go-${PV}.inc + +inherit native + +SRC_URI += "https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" +SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52" + +export GOOS = "${BUILD_GOOS}" +export GOARCH = "${BUILD_GOARCH}" +CC = "${@d.getVar('BUILD_CC').strip()}" + +GOMAKEARGS ?= "--no-banner" + +do_configure() { + cd ${WORKDIR}/go1.4/go/src + CGO_ENABLED=0 GOROOT=${WORKDIR}/go1.4/go ./make.bash +} + +do_compile() { + export GOROOT_FINAL="${libdir_native}/go" + export GOROOT_BOOTSTRAP="${WORKDIR}/go1.4/go" + + cd src + ./make.bash ${GOMAKEARGS} + cd ${B} +} +do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin" + +make_wrapper() { + rm -f ${D}${bindir}/$2$3 + cat <${D}${bindir}/$2$3 +#!/bin/bash +here=\`dirname \$0\` +export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}" +\$here/../lib/go/bin/$1 "\$@" +END + chmod +x ${D}${bindir}/$2 +} + +do_install() { + install -d ${D}${libdir}/go + cp --preserve=mode,timestamps -R ${B}/pkg ${D}${libdir}/go/ + install -d ${D}${libdir}/go/src + (cd ${S}/src; for d in *; do \ + [ -d $d ] && cp -a ${S}/src/$d ${D}${libdir}/go/src/; \ + done) + find ${D}${libdir}/go/src -depth -type d -name testdata -exec rm -rf {} \; + install -d ${D}${bindir} ${D}${libdir}/go/bin + for f in ${B}/bin/* + do + base=`basename $f` + install -m755 $f ${D}${libdir}/go/bin + make_wrapper $base $base + done +} diff --git a/meta/recipes-devtools/go/go-runtime_1.21.0.bb b/meta/recipes-devtools/go/go-runtime_1.21.0.bb deleted file mode 100644 index 63464a1501..0000000000 --- a/meta/recipes-devtools/go/go-runtime_1.21.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require go-${PV}.inc -require go-runtime.inc - diff --git a/meta/recipes-devtools/go/go-runtime_1.21.5.bb b/meta/recipes-devtools/go/go-runtime_1.21.5.bb new file mode 100644 index 0000000000..63464a1501 --- /dev/null +++ b/meta/recipes-devtools/go/go-runtime_1.21.5.bb @@ -0,0 +1,3 @@ +require go-${PV}.inc +require go-runtime.inc + diff --git a/meta/recipes-devtools/go/go_1.21.0.bb b/meta/recipes-devtools/go/go_1.21.0.bb deleted file mode 100644 index 46f5fbc6be..0000000000 --- a/meta/recipes-devtools/go/go_1.21.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -require go-${PV}.inc -require go-target.inc - -inherit linuxloader - -CGO_LDFLAGS:append = " -no-pie" - -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/riscv32 and its -# variants. -python() { - if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'): - d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel") -} - diff --git a/meta/recipes-devtools/go/go_1.21.5.bb b/meta/recipes-devtools/go/go_1.21.5.bb new file mode 100644 index 0000000000..46f5fbc6be --- /dev/null +++ b/meta/recipes-devtools/go/go_1.21.5.bb @@ -0,0 +1,18 @@ +require go-${PV}.inc +require go-target.inc + +inherit linuxloader + +CGO_LDFLAGS:append = " -no-pie" + +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/riscv32 and its +# variants. +python() { + if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'): + d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel") +} + -- cgit v1.2.3-54-g00ecf