From 1acf395b9953a774af49b2349c63973f634852b5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:05 +0000 Subject: [PATCH] dev-lang/go: Sync with Gentoo It's from Gentoo commit 5116b3e1ff1a6986cfe5ead3569c9644a7b14df9. --- .../third_party/portage-stable/dev-lang/go/Manifest | 4 ++-- .../dev-lang/go/files/go-1.24-skip-gdb-tests.patch | 12 ++++++++++++ .../portage-stable/dev-lang/go/go-1.23.6.ebuild | 2 +- .../go/{go-1.23.5-r1.ebuild => go-1.23.7.ebuild} | 2 +- .../go/{go-1.24.0.ebuild => go-1.24.1.ebuild} | 3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.23.5-r1.ebuild => go-1.23.7.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.24.0.ebuild => go-1.24.1.ebuild} (95%) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest index 2691a0ab08..e36fd25295 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest @@ -1,3 +1,3 @@ -DIST go1.23.5.src.tar.gz 28179014 BLAKE2B 6fe6101054a0c10ce415aea65367a48ef8397c88d66bad01b7c72107a6c60daf0b9a47f7c1cd6c8da9855ab04309f25941cc867e6a9f90ac51d1ab0c54662313 SHA512 b04317afeab2d0ced7c36b8682dd32ac085d95d874cf3f614daa34859d7f7f2b75138132e7a64e237c6b4d711d5b03a4d20533f92a44840915630f4ea7cfafa2 DIST go1.23.6.src.tar.gz 28179132 BLAKE2B 25c988547604c35de65aedfdee5af9f35f7a1c43f634c0147373d9c86baf2bb10068463f70013ef60acd3088149eb16502958b1ca63d7cee310e32eaddf1578a SHA512 c504476d42cdbcd1b6afe53c0974e82c19eb0efac974bc06d41c1641440676891cfe6416455a0cfc81fe82902a9b82ea0a1d95089c676667d05487e45f5e04e3 -DIST go1.24.0.src.tar.gz 30663922 BLAKE2B 1a74d268ad2bcfd4773eb9d24f0618491680a5347edba60606b3f50144e2d8879509b2640046e5fa535ff126958deb49c4224443210e3bd79523e65208b616e3 SHA512 36ba9a3a541208fd33aa49b969d892578e209570541d2b6ca6ff784250d8b6777597d347b823c6026acf0c2741b4abc9012693004e623a1434b06cfecdbebaa8 +DIST go1.23.7.src.tar.gz 28181215 BLAKE2B d3c9bff18438f90f6730e1ad9580a3f97d266f90533552cd73b63b512c694de76466435f274dc2b190c672cdbd83ffaf735e4e74c12e426cac920b81dbfd88af SHA512 79192b760ab6fcc9512fd879a9484a3566fdeec5eace36c54b728cd9cb033e7ac68065a42fc657b351a106d684b79fdbefbf682cf63209c0191e7e7c8c0a0147 +DIST go1.24.1.src.tar.gz 30777528 BLAKE2B 76217ec25a721183591a434b012bd9cfb6d6206410aafffce4490bff8053440f2aa590bac0cfb839f10c19a3368fe60515a61123a21d187f5289ba0ae1399c1c SHA512 a924d6bdc7e7101917e6d063bc7b471390525394e79224c152997564657c4362b5600e0c8bf6ee857d345129ccf7368bdf4ed2251ab740446ea2abda144e6353 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch new file mode 100644 index 0000000000..498483571d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch @@ -0,0 +1,12 @@ +diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go +index 9c54d68949..d4eada51af 100644 +--- a/src/runtime/runtime-gdb_test.go ++++ b/src/runtime/runtime-gdb_test.go +@@ -55,6 +55,7 @@ func checkGdbEnvironment(t *testing.T) { + case "plan9": + t.Skip("there is no gdb on Plan 9") + } ++ t.Skip("gdb tests do not work under gentoo portage") + } + + func checkGdbVersion(t *testing.T) { diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild index f0e04aca4a..8e165768f1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.7.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.5-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.7.ebuild index 8e165768f1..626e7c65d7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.7.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.1.ebuild similarity index 95% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.1.ebuild index 733c242415..423eda182b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.1.ebuild @@ -20,7 +20,7 @@ case ${PV} in *) SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " S="${WORKDIR}"/go - KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac @@ -71,6 +71,7 @@ go_cross_compile() { } PATCHES=( + "${FILESDIR}"/go-1.24-skip-gdb-tests.patch "${FILESDIR}"/go-never-download-newer-toolchains.patch )