From 905e7d07da40378586e71ece65bd962b0b00c578 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 7 Mar 2024 01:06:27 +0000 Subject: gentoo auto-resync : 07:03:2024 - 01:06:26 --- dev-lang/Manifest.gz | Bin 21861 -> 21860 bytes dev-lang/go-bootstrap/Manifest | 1 + dev-lang/go-bootstrap/files/make-go-bootstraps | 55 ++++++++++++++++++ dev-lang/go/Manifest | 23 +------- dev-lang/go/files/make-go-bootstraps | 55 ------------------ dev-lang/go/go-1.22.1.ebuild | 76 +++++++------------------ dev-lang/go/go-9999.ebuild | 66 +++++++-------------- dev-lang/go/metadata.xml | 3 - 8 files changed, 101 insertions(+), 178 deletions(-) create mode 100755 dev-lang/go-bootstrap/files/make-go-bootstraps delete mode 100755 dev-lang/go/files/make-go-bootstraps (limited to 'dev-lang') diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index b5d078ec7eb0..f165160d7be8 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/go-bootstrap/Manifest b/dev-lang/go-bootstrap/Manifest index 96a7962e70e5..800878a2c3f3 100644 --- a/dev-lang/go-bootstrap/Manifest +++ b/dev-lang/go-bootstrap/Manifest @@ -1,3 +1,4 @@ +AUX make-go-bootstraps 1424 BLAKE2B 422a3db136f81941ddbdc8c47996daad345c44e03086b80f72f026c734dcbfb0ebb34c24a83dad204024dd1931a057813510654500e61c297f3cfef5d255d615 SHA512 682f9797ef1f693f7e5fe661b267b731bbec2144a7661d87ddeeabafcbb93929cd413de3ffbc892940c9582e1b589d50622561a2245dc279f5e88319f5ae4197 DIST go-1.20.14-darwin-amd64-bootstrap.tbz 94549781 BLAKE2B 604d6b183b6be19f98f330a73fd07db1824442b14c3870447340e628b3fd13c87972d9a192f888e329b1d0337a48d66651f35c0237e4a5a609091e73385925d7 SHA512 ef2b179a096319dca8cd3907ad7c9d80bc61d409ce198a323073fbceb3b6ab3f5752eaeeb8f37f9287ba1c009f5e37da341e359228d0509ab766340f61a10c68 DIST go-1.20.14-darwin-arm64-bootstrap.tbz 92159553 BLAKE2B 28a95dafd3126e95fd997744ca20385bf634c3bc08be5698bc314c8e902e261d66ebae754492997562ba3bd2635f68ad8173cbd84aa6e59bcf38fe0c2cd35a65 SHA512 1f39a132037f9b1141cac752c20c34da0f87583dba9094965ffb7f65015d3d5273a1b63201e1f68e00d436aa1b1d79972f6f50a195a3d5799f012fb3fbaa20b6 DIST go-1.20.14-linux-386-bootstrap.tbz 96003553 BLAKE2B c3a07e7dd840387281b065aebd216fa0cdd1c2e7bc71cce63f4a0fd7fa2ce1848f2b3b91c2506bea1a5b747ca7eece9aff08fe67dcf6b63f8afcc4a92e382f6b SHA512 236423e5b65078afd7a44f83f91f0b2bf11c78871d01adce942651ec24d02ae96021dfdb00640034dff9b43c636b1975402b68955bf6572c680dfbbb9bdb266e diff --git a/dev-lang/go-bootstrap/files/make-go-bootstraps b/dev-lang/go-bootstrap/files/make-go-bootstraps new file mode 100755 index 000000000000..a929fd988377 --- /dev/null +++ b/dev-lang/go-bootstrap/files/make-go-bootstraps @@ -0,0 +1,55 @@ +#!/bin/bash +set -e + +# This creates go bootstrap tarballs for the version of go currently +# installed on your system. +# It should be run as part of bumping dev-lang/go when a newer version +# of go is required for bootstrapping. +# Make sure the version of go required for bootstrapping is installed +# then run this script. +# The script will output the location where the bootstrap tarballs are +# stored. +# Next, update the GO_BV variable in the new version of the dev-lang/go +# ebuild to the version in the bootstrap tarballs file name. + +go_tuples=( + darwin-amd64 + darwin-arm64 + linux-386 + linux-amd64 + linux-arm + linux-arm64 + linux-loong64 + linux-mips + linux-mipsle + linux-mips64 + linux-mips64le + linux-ppc64 + linux-ppc64le + linux-riscv64 + linux-s390x + solaris-amd64 +) + +go_version=$(go version) +go_version=${go_version##*go} +go_version=${go_version%% *} +build_path=$(mktemp -d /tmp/go-bootstraps-XXXXXX) +pushd "${build_path}" +git clone https://github.com/golang/go.git +cd go +git checkout go"${go_version}" +cd src +for tuple in ${go_tuples[@]}; do + printf "Building go version %s bootstrap tarball for %s\n" "${go_version}" "${tuple}" + GOOS=${tuple%%-*} GOARCH=${tuple##*-} ./bootstrap.bash + rm -fr ../../go-${tuple}-bootstrap +done +cd ../.. +rm -fr go +for f in *tbz; do + mv "${f}" "${f/go/go-${go_version}}" + done +popd +mv "${build_path}" "${build_path%-*}" +printf "The bootstrap tarballs are stored in %s\n" "${build_path%-*}" diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index a9b524491f56..70bf36213654 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -1,22 +1,5 @@ AUX go-never-download-newer-toolchains.patch 368 BLAKE2B 0c90f46492af80622f430b2d506b143f3b553b5276085f78f41b93fee8219745179038302462603b5b1677554d92911eb4865084d0488aaa4c71ae1abc307f71 SHA512 b5acf97ccf96c6a353fcb7bd97113c38562defd82338828124fcc72c71334feda9c4e839d2aae5b66b809bc8a692eac96396c54a478e17a7ffd8d2c68fea95e6 AUX go-sets.conf 256 BLAKE2B 670afd72a2fa961e2b3882ac48d10e9d047af7a68f47bc8c8985b2de7a84022410fb1acfe2c710f8b3804ec3b043bf18c948478cf7d31c982cff47714b309cdf SHA512 028fba72c2d82ef893416970c27cb277be15f7c5c67773c0a62cd8ce2c192813ba851339596f10a6f5394c479e67b62dd4e4520379cc03f764ed4a4ab834fba6 -AUX make-go-bootstraps 1424 BLAKE2B 422a3db136f81941ddbdc8c47996daad345c44e03086b80f72f026c734dcbfb0ebb34c24a83dad204024dd1931a057813510654500e61c297f3cfef5d255d615 SHA512 682f9797ef1f693f7e5fe661b267b731bbec2144a7661d87ddeeabafcbb93929cd413de3ffbc892940c9582e1b589d50622561a2245dc279f5e88319f5ae4197 -DIST go-1.20.14-darwin-amd64-bootstrap.tbz 94549781 BLAKE2B 604d6b183b6be19f98f330a73fd07db1824442b14c3870447340e628b3fd13c87972d9a192f888e329b1d0337a48d66651f35c0237e4a5a609091e73385925d7 SHA512 ef2b179a096319dca8cd3907ad7c9d80bc61d409ce198a323073fbceb3b6ab3f5752eaeeb8f37f9287ba1c009f5e37da341e359228d0509ab766340f61a10c68 -DIST go-1.20.14-darwin-arm64-bootstrap.tbz 92159553 BLAKE2B 28a95dafd3126e95fd997744ca20385bf634c3bc08be5698bc314c8e902e261d66ebae754492997562ba3bd2635f68ad8173cbd84aa6e59bcf38fe0c2cd35a65 SHA512 1f39a132037f9b1141cac752c20c34da0f87583dba9094965ffb7f65015d3d5273a1b63201e1f68e00d436aa1b1d79972f6f50a195a3d5799f012fb3fbaa20b6 -DIST go-1.20.14-linux-386-bootstrap.tbz 96003553 BLAKE2B c3a07e7dd840387281b065aebd216fa0cdd1c2e7bc71cce63f4a0fd7fa2ce1848f2b3b91c2506bea1a5b747ca7eece9aff08fe67dcf6b63f8afcc4a92e382f6b SHA512 236423e5b65078afd7a44f83f91f0b2bf11c78871d01adce942651ec24d02ae96021dfdb00640034dff9b43c636b1975402b68955bf6572c680dfbbb9bdb266e -DIST go-1.20.14-linux-amd64-bootstrap.tbz 95467194 BLAKE2B d0d016a1f6334db056342432f401edf17c9ea0032ed13f3a1ab127b4697fcc18e471cd133ed306ccd98d62779bc2d0304a97a7100f91c566ca064237dab109d0 SHA512 638103faca6d913a8b774a00b1846e746c1f6272f1d3d0343942e81886aee84b6a8b10befab5d1e9e9ad7c3f1a3cbf72a2ff223fd236c21a6ef05ed63ae4c495 -DIST go-1.20.14-linux-arm-bootstrap.tbz 92749037 BLAKE2B 4a58c00132c84510cff0cbca9ed910b565220dfd2f7ef2080b40b3bb35f94b1d3d05e36e964ebf715261c13b38763be0c4df1ac8675f7bd27e9f087a710236b5 SHA512 94aa1264ac11243959d2768e67d29e405ec1a63daef3efdea695950fcbacb0e5bfad68eae71e5bca31e74415fc8fce90de2de9ac440e67921221a1b166cf9b23 -DIST go-1.20.14-linux-arm64-bootstrap.tbz 90313482 BLAKE2B 839f7e2a30944c622cdd3ebbcda8cbbaff6070b0c6bff3c2cdb5429f65df5cd830ed211d05df81d5f25c798e8d113d6bfe605e12b25f271ab35f9a7e98e6a95e SHA512 b7336febe2f687c8b91a885885a5f85e9a25333120fec38c08b96e115cbd1f66bd054d8c8a69891c210f60609828dc8cd9d188ac06d98d97fcec75730c97b5c9 -DIST go-1.20.14-linux-loong64-bootstrap.tbz 91910305 BLAKE2B e470bed6fdcae3e5baf9e8079bfaa211814cee00a9bebf2bfef24a27e249b2b2251b1400389b5844ed1f7631a4d8306b358bdf43f92bc96c2d071e79949b4e26 SHA512 2c878541d02cadd7cbe66647ef1cbec2ef1c9b43c4798adfd8cdf3ad800c6cc2bd2c702af221e133fa03099029e740362c9f490b1ace6c530462b27d73fb9d50 -DIST go-1.20.14-linux-mips-bootstrap.tbz 89723945 BLAKE2B c3ac0d9de529f4d033cf3942726124013f9772aa62174d185e1883e359bc195aca531170a4ba25c40de8d5b8c74d7553b461aabeeca31f76737d38fe86d7ca9a SHA512 461b043acece310ac3c4750086092d4ba6e56c5dcfa2eef1e2d626e8f4d18796dc8d13e9d4e36a2bea500422c7b6aeba863a0da74305ad7952cf2d05fd371c8b -DIST go-1.20.14-linux-mips64-bootstrap.tbz 90162590 BLAKE2B f3fc550a6f2b05dd99fcb1a2437a3c2a4db7d13d434bad9478c400449286a78ea8f824fc40ba2e7e88646d9220ae0508ca57f2cad277b0fcc444d20e0ec8f594 SHA512 046baa51362abfa0865fea437d4b80e90b113387d2603661d1ca96c819237b459d3fc50d69acfc0b41b906baed56da031801ec913e55baf0db389ddf10d93d3b -DIST go-1.20.14-linux-mips64le-bootstrap.tbz 89241603 BLAKE2B 1708a4d82376ea34dc3c569b2b44e34cb0a6698a4bfb1c04da89da6c2b660e93372926c4d88ca9cc8185c2b5949265779038882b84ff9ea99ddbb709cf7dac91 SHA512 ce95ca20b66bea1f4faa2edede7082858689cb50d5579225c635ba7987db7d0627453ae06eb141678cc46720d0bc050ae87d4fc3fbbbaaa16f4db7fd0234b6d2 -DIST go-1.20.14-linux-mipsle-bootstrap.tbz 89478289 BLAKE2B e09bf90783a11dda0ed81a2a1f8998bd7ea6ef4c7dc06e0e1abfc885a4cf0622bf40ae9d74d2bb3683ecb96b9a93a3064a8783a609cd88ef3f319af6332bf52d SHA512 5246e8da2fe58053bbdfa861d527b119227eacd055a7e69ffbb1e5c3dd2f477a286951c0577632c492f34ffc3ef4c015b1b7affdf5cca03b22bb0ef1ddea52de -DIST go-1.20.14-linux-ppc64-bootstrap.tbz 91456774 BLAKE2B b4a7ca37f7bfe4c13dbfcb94cbd0521e924ba322eb49a49c6934dbb3b00c7f4929828dde3f18e1c26421c684f4a63bcf7f0834a30d58918b53fd13fc908860ee SHA512 28d9c6b33ab7f72f840fd06b0219845638c3df50b7741152f303288a3b4ab55e7bdb083dbd668e95563e459950e4e89ae9edf7ad604687afe5247781330e2fb1 -DIST go-1.20.14-linux-ppc64le-bootstrap.tbz 90575770 BLAKE2B 0c76ba27d41d329a7c58ae5c2c168e021a4fbb01800cdc7e61baf50de57b146578aef123755b09df5a4aa405452e2b3cc9ff1960cdc34c3a38442691e7cd0422 SHA512 d3ecb191f73f157a09252c50ffb8249040bfb4ba39dc0a462c992830eba3eeadb18b7851410a1f9f2d6d362ee37fcb210c815d7b01cc632e10d962cb2c2769e9 -DIST go-1.20.14-linux-riscv64-bootstrap.tbz 93091456 BLAKE2B 197811a57c728ef546b9660328ab6624b87ae085e98264e5b3317fc66581fc0ee8ef95af3040c07a6cebfe30da88d209bf5bdb8ee11a647b716fa3122031724a SHA512 a3faaeaac90354a9be130d01108c8fdb178a0427d7dab0362c570428216ddd362f55044021082cbbb466f3a69458869d4978bd28652f7a4e55295d357c9c7c54 -DIST go-1.20.14-linux-s390x-bootstrap.tbz 94671247 BLAKE2B 7ff60a7c1245b66cbe852662589fe3a87c4fc29a1134dd46ad76272b9bc619b7ffba823374658a0f8d54a440d808d3eb8d97788483bbe69628bda167f4377109 SHA512 bc6c7efddfcc90fe2f1bbb2dee7f4396eb5b478eee7236216ca00c5bd4ce1dc0e3315edb58bf6ef3f7a7e5c45950e6f5be9163cfffd1cf5c36004aaa4916a1b7 -DIST go-1.20.14-solaris-amd64-bootstrap.tbz 95085901 BLAKE2B aed378201db555121bae1ab049d44b297dc922d7cd977c3d6f2dbff1b3cc46f59a697a211c244ed2f012d5c8ea6211501527512325188e34a3ccd2946ef6dbe8 SHA512 22a8b79ab2eb08319d1d9fb517458cdafd1a4fcbba2da70935d65ccdcc3808978ca0dbb045a7cfde2ca43eb6effd3ce687d2f99ee24dedcae9967b414fd6fe57 DIST go1.21.5.src.tar.gz 26986890 BLAKE2B a57550a3f586060d8efa93b6c8d9bf3f87d791ebf66767c9a3344983111aa14ed88c71fe44aabe79b64dcdad85426de647eaf5845d9a5cac082b42969f9a27cb SHA512 c064b7cb3c47d8fb99fc181a3cddf327a4b7a8c6af39a8ac568e9d74cd44903141680903ca48673bb02a7a159cce4f32a94f3b37fc65a9549d3518ad7c731fa3 DIST go1.21.6.src.tar.gz 27058459 BLAKE2B 04909d067f8dc1c1bb45d9d0a87f9d0fedb69b42a4eb89ddb24d19df7c0f77c86c6283b579f3b3f9caa3ffba6ab5f325a71552e37b38ba4082e878bd0bc942a3 SHA512 8472c1c6c3fae9fecfb512a16f18ed531c04c087429a75086b9999069330c1b1e4a01a30c6561b5092169144cbc0d787ec2f5f4a50dfc4f79e74398f16423cfd DIST go1.21.7.src.tar.gz 26991014 BLAKE2B 7002b8a6662594f9dc44f215f8c76c2d17057a117c6d8b24929b5fa015a7222a1fe56d3091fcabb74f993c22000c3239645b12b94303751053be83336120cfa0 SHA512 5cadc458265deea2650fbbc5b0652e19e858fa7a7b929ea717e82ee4be2af45214a9dfc5b8b799003e83b92aa80141962a472d1d4f0653e97e99df5b68c88e5d @@ -28,6 +11,6 @@ EBUILD go-1.21.6.ebuild 5206 BLAKE2B d1618ba01d1c74873875216e306891cc6a0610a0fee EBUILD go-1.21.7.ebuild 5205 BLAKE2B bc3ea565882c296cbcf077e791f857f959fe9ecb09ac45434e94ba94b0c068a483cc242605a085f1bb7f0bb008a73724fe68440112cba1343c3044d0d35fab85 SHA512 89a2021675a60dd4a4bb620e8e1cf51955b49afc00246d300644fb20eeafcc85b822dc3bcd3cfc62ed1d3fec1a988efa3976a9d3d746ec1880bb6162287de439 EBUILD go-1.21.8.ebuild 5209 BLAKE2B 5656d72770d2f5d6092328eeb3883f303407e591845530c2041df1382ffec3cde87c150ac591f4a4bebfa2dada0b504151c36e454d66269d31fe975eab786917 SHA512 d0b37538789f820c8314dbfbe9e8b5a18de1c3a8009d3e2633d6b4f0bdf1bd100374232f8323e7e55c67300e98f70468b3e26ea57153448d7bb24d629e9387e6 EBUILD go-1.22.0.ebuild 5274 BLAKE2B a5a2b88b048cb4a42f8d477ba507febfd99713bc9054847fa5a9beb5c0f8140c6ebc42b3bb87703f798a8dc8ee0067c7568b5d98e64a18ff617fafe98fe82faf SHA512 de58d78054b0281de2dd3bff87e9fcc8e6aa094c749ffcec398b7766dc4e2e7369179082e1193bb3dd9b913b75970ecc0144c0ba62a51225331ea55b4b15ce54 -EBUILD go-1.22.1.ebuild 6645 BLAKE2B c8c30030e575ebc4f9215445dbe913809279084cde6df11c73b70117429a22f7e26f6bc5ca28e2522ca767b078b4269746f1a5beddc35f6ba0b4d79cde2393bb SHA512 bffee8ccf2e472fcea0171dc67cbb16d6310215f39d8cb9620f712c08b9542e7e45896aa077b1af259bf7e3bae9f6280983a25f692aff4f453ad177c0ed08ba9 -EBUILD go-9999.ebuild 6311 BLAKE2B 6ffdc7aae91ee54ec69497a240a796fed70e307e264cc7a495b20a8bd000c24ece8514095092dd496795b3ebf7ccbd9eb6e47f21abc1e83fe07dec9e408e5ef0 SHA512 8807f6246bf8cb0b885916ae0b1dc9b92d13f7af51968b22ffa4ce8fe14f9b9bc3db054a0e651fbb5cf3a3d8b0844891c06e269a443a31f0e0fba95ef76ce4f2 -MISC metadata.xml 681 BLAKE2B 79c8b806f977b1f57a3f5fdf98a205405ce76c8700cc48e3e8458cf9e8bb6de872ebb5725b3212fc1042b5bd7950c8bed217abdbed955057a51a61225da838f8 SHA512 637e2a60649006a1570c532a90203833c6dd58bd0bf8e95c1962414c9250b87ce088ba2c6e511da43ccc800066d1752a8d0971585bf2be0d0bd47fd3fa8deb74 +EBUILD go-1.22.1.ebuild 5274 BLAKE2B fb71001874cd0037ff66a9b8dacc058c7276bac4095402eea81fef64eaa3f336ebe04535385fc5036aaf10267f578ef0742f2b088bd15e88747c53fc742b7a13 SHA512 139516a4593e9abcb35fa754db6c0582d3f113e68ec65fb6cf34c96673eff792c0d95cddf8786a66ffcd0725782f08b0d43b61ad10229c3c00a4a372f2f2eb96 +EBUILD go-9999.ebuild 5274 BLAKE2B fb71001874cd0037ff66a9b8dacc058c7276bac4095402eea81fef64eaa3f336ebe04535385fc5036aaf10267f578ef0742f2b088bd15e88747c53fc742b7a13 SHA512 139516a4593e9abcb35fa754db6c0582d3f113e68ec65fb6cf34c96673eff792c0d95cddf8786a66ffcd0725782f08b0d43b61ad10229c3c00a4a372f2f2eb96 +MISC metadata.xml 589 BLAKE2B 341e4c0e91d73ca668c1795035e1223eed60f85c724afd989ef1f8fb69649f7f6eaaf8a5228f6c8f587ffcc40a438c47d332fbe6866839f5a0829872a983f642 SHA512 fe58ddddfbd4d0d060516cb035592a80c0f48e125bb59c95d3c6fac0c182271e2a9ec9bd055b9cc8e6cb8c449e6c483bff4a23c362f532c24255febfdefc273a diff --git a/dev-lang/go/files/make-go-bootstraps b/dev-lang/go/files/make-go-bootstraps deleted file mode 100755 index a929fd988377..000000000000 --- a/dev-lang/go/files/make-go-bootstraps +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -set -e - -# This creates go bootstrap tarballs for the version of go currently -# installed on your system. -# It should be run as part of bumping dev-lang/go when a newer version -# of go is required for bootstrapping. -# Make sure the version of go required for bootstrapping is installed -# then run this script. -# The script will output the location where the bootstrap tarballs are -# stored. -# Next, update the GO_BV variable in the new version of the dev-lang/go -# ebuild to the version in the bootstrap tarballs file name. - -go_tuples=( - darwin-amd64 - darwin-arm64 - linux-386 - linux-amd64 - linux-arm - linux-arm64 - linux-loong64 - linux-mips - linux-mipsle - linux-mips64 - linux-mips64le - linux-ppc64 - linux-ppc64le - linux-riscv64 - linux-s390x - solaris-amd64 -) - -go_version=$(go version) -go_version=${go_version##*go} -go_version=${go_version%% *} -build_path=$(mktemp -d /tmp/go-bootstraps-XXXXXX) -pushd "${build_path}" -git clone https://github.com/golang/go.git -cd go -git checkout go"${go_version}" -cd src -for tuple in ${go_tuples[@]}; do - printf "Building go version %s bootstrap tarball for %s\n" "${go_version}" "${tuple}" - GOOS=${tuple%%-*} GOARCH=${tuple##*-} ./bootstrap.bash - rm -fr ../../go-${tuple}-bootstrap -done -cd ../.. -rm -fr go -for f in *tbz; do - mv "${f}" "${f/go/go-${go_version}}" - done -popd -mv "${build_path}" "${build_path%-*}" -printf "The bootstrap tarballs are stored in %s\n" "${build_path%-*}" diff --git a/dev-lang/go/go-1.22.1.ebuild b/dev-lang/go/go-1.22.1.ebuild index 6b21274bfbf5..fc36a2d33ae9 100644 --- a/dev-lang/go/go-1.22.1.ebuild +++ b/dev-lang/go/go-1.22.1.ebuild @@ -1,56 +1,24 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} +# See "Bootstrap" in release notes +GO_BOOTSTRAP_MIN=1.20.14 MY_PV=${PV/_/} inherit toolchain-funcs -# See "Bootstrap" in release notes -# GO_BV is set to the minimum version of go required to bootstrap the -# current version. -GO_BV=1.20.14 -BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" -SRC_URI=" - !system-bootstrap? ( - amd64? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-amd64-bootstrap.tbz ) - arm? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-arm-bootstrap.tbz ) - arm64? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-arm64-bootstrap.tbz ) - loong? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-loong64-bootstrap.tbz ) - mips? ( - abi_mips_o32? ( - big-endian? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-mips-bootstrap.tbz ) - !big-endian? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-mipsle-bootstrap.tbz ) - ) - abi_mips_n64? ( - big-endian? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-mips64-bootstrap.tbz ) - !big-endian? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-mips64le-bootstrap.tbz ) - ) - ) - ppc64? ( - big-endian? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-ppc64-bootstrap.tbz ) - !big-endian? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-ppc64le-bootstrap.tbz ) - ) - riscv? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-riscv64-bootstrap.tbz ) - s390? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-s390x-bootstrap.tbz ) - x86? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-linux-386-bootstrap.tbz ) - x64-macos? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-darwin-amd64-bootstrap.tbz ) - arm64-macos? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-darwin-arm64-bootstrap.tbz ) - x64-solaris? ( ${BOOTSTRAP_DIST}/go-${GO_BV}-solaris-amd64-bootstrap.tbz ) - ) - " - case ${PV} in *9999*) EGIT_REPO_URI="https://github.com/golang/go.git" inherit git-r3 ;; *) - SRC_URI+=" https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " + SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " S="${WORKDIR}"/go case ${PV} in *_beta*|*_rc*) ;; @@ -65,11 +33,14 @@ HOMEPAGE="https://go.dev" LICENSE="BSD" SLOT="0/${PV}" -IUSE="abi_mips_o32 abi_mips_n64 big-endian system-bootstrap" +IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2" RDEPEND=" arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )" +BDEPEND="|| ( + >=dev-lang/go-${GO_BOOTSTRAP_MIN} + >=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )" # the *.syso files have writable/executable stacks QA_EXECSTACK='*.syso' @@ -154,12 +125,20 @@ PATCHES=( "${FILESDIR}"/go-never-download-newer-toolchains.patch ) -src_unpack() { - default - [[ ${PV} == *9999* ]] && git-r3_src_unpack -} - src_compile() { + if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" + elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" + else + eerror "Go cannot be built without go or go-bootstrap installed" + die "Should not be here, please report a bug" + fi + + export GOROOT_FINAL="${EPREFIX}"/usr/lib/go + export GOROOT="${PWD}" + export GOBIN="${GOROOT}/bin" + # Go's build script does not use BUILD/HOST/TARGET consistently. :( export GOHOSTARCH=$(go_arch ${CBUILD}) export GOHOSTOS=$(go_os ${CBUILD}) @@ -172,19 +151,6 @@ src_compile() { use arm && export GOARM=$(go_arm) use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat') - export GOROOT="${PWD}" - if use system-bootstrap; then - if has_version =dev-lang/go-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" + elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" + else + eerror "Go cannot be built without go or go-bootstrap installed" + die "Should not be here, please report a bug" + fi + + export GOROOT_FINAL="${EPREFIX}"/usr/lib/go + export GOROOT="${PWD}" + export GOBIN="${GOROOT}/bin" + # Go's build script does not use BUILD/HOST/TARGET consistently. :( export GOHOSTARCH=$(go_arch ${CBUILD}) export GOHOSTOS=$(go_os ${CBUILD}) @@ -170,11 +151,6 @@ src_compile() { use arm && export GOARM=$(go_arm) use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat') - export GOROOT="${PWD}" - export GOROOT_BOOTSTRAP="${WORKDIR}/go-${GOOS}-${GOARCH}-bootstrap" - export GOROOT_FINAL="${EPREFIX}"/usr/lib/go - export GOBIN="${GOROOT}/bin" - cd src bash -x ./make.bash || die "build failed" } diff --git a/dev-lang/go/metadata.xml b/dev-lang/go/metadata.xml index 51455ddf8e9f..5e00214a73f6 100644 --- a/dev-lang/go/metadata.xml +++ b/dev-lang/go/metadata.xml @@ -14,7 +14,4 @@ cpe:/a:golang:go golang/go - - Bootstrap using installed go compiler - -- cgit v1.2.3