commit:     cb4f581b70aa5d8223bdd8482d7376ad219286c9
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 22:06:44 2023 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 22:06:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4f581b

dev-lang/go: add 1.20.12, 1.21.5

Bug: https://bugs.gentoo.org/919310
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 dev-lang/go/Manifest          |   2 +
 dev-lang/go/go-1.20.12.ebuild | 210 ++++++++++++++++++++++++++++++++++++++++++
 dev-lang/go/go-1.21.5.ebuild  | 210 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 422 insertions(+)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index e7e5f6c3ffb2..97c42e20baf7 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,6 +1,8 @@
 DIST go1.20.10.src.tar.gz 26198392 BLAKE2B 
a9e99e64e6f11a48f8f9682e83c0ae5be4c3252814d869a2e70e445818df018e49e53e1d4c740a5e32a8a811362a5fc1ed3c61233dc967e3b50bf914b47eb60f
 SHA512 
1c6304abb8a7847cedb634380d43fcbf2b206f0e6af99e915b4735b4c5f9dfc08a01db6d41edaed91a2a8140fcd886343d39465bd6fb53bd37be0a7f41dc6525
 DIST go1.20.11.src.tar.gz 26198249 BLAKE2B 
c4df80b5e8b35d6204bbfb29ce71d9fb973b5a17d98baed47e04a0c2a95095c52f1da0669661ffb32bed941ebafcd54d86b7169830e16cdc80cc0ece92e28064
 SHA512 
d89fb9ecd9fe394b7f6b9a0ad98db2f9401bec203d64cc5c301d3678f6a74524bae85a9ece31ad2ea66a3ffec90f35cb30e600e0c910bcc6010ad36b501c5c37
+DIST go1.20.12.src.tar.gz 26200362 BLAKE2B 
f33dc8c1ce565443c2cd975db493998bf921eb9734b5e58f7200d6ddfd9c076cabcab105cb3d335c2dabff6a3d01a6fa52e597357e8bd616c8a7462aa5fb89d7
 SHA512 
3f4d1a22a0f1dd7e8feb008517e43b32c3600ce77168e5edfb75b4060577362ae62f28c9891de0f7bf553407bd8e09efc1563d34ee8af5285b3c80b3946f4b65
 DIST go1.20.8.src.tar.gz 26197375 BLAKE2B 
1d6c5eb4da9f2f892b30013427b54039feeaf0bc41e1928a82da56e1c96689a796828758989a85a2d156f0547826eb0d408c324a93e02894dbb0a6c7b73b6b67
 SHA512 
858d0289b3cd709e71e14aed9a36fd3d462fb3aa72cc1108eef0c70ab583742ab2eff99a24f8bfd72d42d1cc741adc1d3619073fbed943f8aea20e453ed479d3
 DIST go1.21.1.src.tar.gz 26974429 BLAKE2B 
716f7c94d29dedd2e69f33a6d9d3cab9d7b02635915bfeab00dcadcc10a40812cd8fe76c1388f0eb8cbfa3cf84e2fd2d2595eab6d2c8782b3ea760e154be21d5
 SHA512 
b6bee4a461ed91958c334b2f8b78e8f0c45f07409ba6968ae393b34d9cd21a9b1a29df357d191144e99f8ea73f491926ea0027ecbcfcaa198349e67fa33e0e3c
 DIST go1.21.3.src.tar.gz 26976568 BLAKE2B 
5c2f76c43f9e98e36f65af38d3e9644693ca9f6921ada29918c7c736d5c9d65dfb454be324117e6423d31d1b55f2c1117941c7431ea9f057cd4c249e40b3ae06
 SHA512 
c98d31b9c477c0ac4b6f6933adefb40fdce5cdbb171e5236e3b694fec9e5b04695487af734259eab304dd42e86341240621a781f54b60c719627fd7b5efe4742
 DIST go1.21.4.src.tar.gz 26979154 BLAKE2B 
e56ff80953471add7db8f2860e9212922bee9656f624a5c090f25a509709fa0473ebe6f3aa175463f8c67214410ba777954ac714f50c7f58ce1b32ad94c29b5e
 SHA512 
a6019d51876d7705f7737cddae748f9df3b4e1b40d678094465d2e81b18a4a99b93c3979d318d6c0c6d314e44554894105d07665b7d81acbbfd80203d3ed95bc
+DIST go1.21.5.src.tar.gz 26986890 BLAKE2B 
a57550a3f586060d8efa93b6c8d9bf3f87d791ebf66767c9a3344983111aa14ed88c71fe44aabe79b64dcdad85426de647eaf5845d9a5cac082b42969f9a27cb
 SHA512 
c064b7cb3c47d8fb99fc181a3cddf327a4b7a8c6af39a8ac568e9d74cd44903141680903ca48673bb02a7a159cce4f32a94f3b37fc65a9549d3518ad7c731fa3

diff --git a/dev-lang/go/go-1.20.12.ebuild b/dev-lang/go/go-1.20.12.ebuild
new file mode 100644
index 000000000000..ee74dcbc30da
--- /dev/null
+++ b/dev-lang/go/go-1.20.12.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+# See "Bootstrap" in release notes
+GO_BOOTSTRAP_MIN=1.17.13
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+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 "
+       S="${WORKDIR}"/go
+       case ${PV} in
+       *_beta*|*_rc*) ;;
+       *)
+               KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv 
~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+               ;;
+       esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev";
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+       CONTRIBUTING.md
+       PATENTS
+       README.md
+       SECURITY.md
+)
+
+go_arch() {
+       # By chance most portage arch names match Go
+       local tc_arch=$(tc-arch $@)
+       case "${tc_arch}" in
+               x86)    echo 386;;
+               x64-*)  echo amd64;;
+               loong)  echo loong64;;
+               mips) if use abi_mips_o32; then
+                               [[ $(tc-endian $@) = big ]] && echo mips || 
echo mipsle
+                       elif use abi_mips_n64; then
+                               [[ $(tc-endian $@) = big ]] && echo mips64 || 
echo mips64le
+                       fi ;;
+               ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo 
ppc64le ;;
+               riscv) echo riscv64 ;;
+               s390) echo s390x ;;
+               *)              echo "${tc_arch}";;
+       esac
+}
+
+go_arm() {
+       case "${1:-${CHOST}}" in
+               armv5*) echo 5;;
+               armv6*) echo 6;;
+               armv7*) echo 7;;
+               *)
+                       die "unknown GOARM for ${1:-${CHOST}}"
+                       ;;
+       esac
+}
+
+go_os() {
+       case "${1:-${CHOST}}" in
+               *-linux*)       echo linux;;
+               *-darwin*)      echo darwin;;
+               *-freebsd*)     echo freebsd;;
+               *-netbsd*)      echo netbsd;;
+               *-openbsd*)     echo openbsd;;
+               *-solaris*)     echo solaris;;
+               *-cygwin*|*-interix*|*-winnt*)
+                       echo windows
+                       ;;
+               *)
+                       die "unknown GOOS for ${1:-${CHOST}}"
+                       ;;
+       esac
+}
+
+go_tuple() {
+       echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+       [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+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})
+       export CC=$(tc-getBUILD_CC)
+
+       export GOARCH=$(go_arch)
+       export GOOS=$(go_os)
+       export CC_FOR_TARGET=$(tc-getCC)
+       export CXX_FOR_TARGET=$(tc-getCXX)
+       use arm && export GOARM=$(go_arm)
+       use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+       cd src
+       bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+       go_cross_compile && return 0
+
+       cd src
+
+       # https://github.com/golang/go/issues/42005
+       rm cmd/link/internal/ld/fallocate_test.go || true
+
+       PATH="${GOBIN}:${PATH}" \
+       ./run.bash -no-rebuild || die "tests failed"
+       cd ..
+       rm -fr pkg/*_race || die
+       rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+       # There is a known issue which requires the source tree to be installed 
[1].
+       # Once this is fixed, we can consider using the doc use flag to control
+       # installing the doc and src directories.
+       # The use of cp is deliberate in order to retain permissions
+       # [1] https://golang.org/issue/2775
+       dodir /usr/lib/go
+       cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+       einstalldocs
+
+       # testdata directories are not needed on the installed system
+       rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+       local bin_path
+       if go_cross_compile; then
+               bin_path="bin/$(go_tuple)"
+       else
+               bin_path=bin
+       fi
+       local f x
+       for x in ${bin_path}/*; do
+               f=${x##*/}
+               dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+       done
+
+       # install the @golang-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+       [[ -z ${REPLACING_VERSIONS} ]] && return
+       elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+       elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+       elog "due to the static linking nature of go."
+       elog "If this is not done, the packages compiled with the older"
+       elog "version of the compiler will not be updated until they are"
+       elog "updated individually, which could mean they will have"
+       elog "vulnerabilities."
+       elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+       elog "See https://bugs.gentoo.org/752153 for more info"
+}

diff --git a/dev-lang/go/go-1.21.5.ebuild b/dev-lang/go/go-1.21.5.ebuild
new file mode 100644
index 000000000000..f57144c11909
--- /dev/null
+++ b/dev-lang/go/go-1.21.5.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+# See "Bootstrap" in release notes
+GO_BOOTSTRAP_MIN=1.17.13
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+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 "
+       S="${WORKDIR}"/go
+       case ${PV} in
+       *_beta*|*_rc*) ;;
+       *)
+               KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv 
~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+               ;;
+       esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev";
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+       CONTRIBUTING.md
+       PATENTS
+       README.md
+       SECURITY.md
+)
+
+go_arch() {
+       # By chance most portage arch names match Go
+       local tc_arch=$(tc-arch $@)
+       case "${tc_arch}" in
+               x86)    echo 386;;
+               x64-*)  echo amd64;;
+               loong)  echo loong64;;
+               mips) if use abi_mips_o32; then
+                               [[ $(tc-endian $@) = big ]] && echo mips || 
echo mipsle
+                       elif use abi_mips_n64; then
+                               [[ $(tc-endian $@) = big ]] && echo mips64 || 
echo mips64le
+                       fi ;;
+               ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo 
ppc64le ;;
+               riscv) echo riscv64 ;;
+               s390) echo s390x ;;
+               *)              echo "${tc_arch}";;
+       esac
+}
+
+go_arm() {
+       case "${1:-${CHOST}}" in
+               armv5*) echo 5;;
+               armv6*) echo 6;;
+               armv7*) echo 7;;
+               *)
+                       die "unknown GOARM for ${1:-${CHOST}}"
+                       ;;
+       esac
+}
+
+go_os() {
+       case "${1:-${CHOST}}" in
+               *-linux*)       echo linux;;
+               *-darwin*)      echo darwin;;
+               *-freebsd*)     echo freebsd;;
+               *-netbsd*)      echo netbsd;;
+               *-openbsd*)     echo openbsd;;
+               *-solaris*)     echo solaris;;
+               *-cygwin*|*-interix*|*-winnt*)
+                       echo windows
+                       ;;
+               *)
+                       die "unknown GOOS for ${1:-${CHOST}}"
+                       ;;
+       esac
+}
+
+go_tuple() {
+       echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+       [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+PATCHES=(
+       "${FILESDIR}"/go-never-download-newer-toolchains.patch
+)
+
+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})
+       export CC=$(tc-getBUILD_CC)
+
+       export GOARCH=$(go_arch)
+       export GOOS=$(go_os)
+       export CC_FOR_TARGET=$(tc-getCC)
+       export CXX_FOR_TARGET=$(tc-getCXX)
+       use arm && export GOARM=$(go_arm)
+       use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+       cd src
+       bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+       go_cross_compile && return 0
+
+       cd src
+
+       # https://github.com/golang/go/issues/42005
+       rm cmd/link/internal/ld/fallocate_test.go || die
+
+       PATH="${GOBIN}:${PATH}" \
+       ./run.bash -no-rebuild -k || die "tests failed"
+}
+
+src_install() {
+       dodir /usr/lib/go
+       # The use of cp is deliberate in order to retain permissions
+       cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+       einstalldocs
+
+       insinto /usr/lib/go
+       doins go.env VERSION
+
+       # testdata directories are not needed on the installed system
+       rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+       local bin_path
+       if go_cross_compile; then
+               bin_path="bin/$(go_tuple)"
+       else
+               bin_path=bin
+       fi
+       local f x
+       for x in ${bin_path}/*; do
+               f=${x##*/}
+               dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+       done
+
+       # install the @golang-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+       [[ -z ${REPLACING_VERSIONS} ]] && return
+       elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+       elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+       elog "due to the static linking nature of go."
+       elog "If this is not done, the packages compiled with the older"
+       elog "version of the compiler will not be updated until they are"
+       elog "updated individually, which could mean they will have"
+       elog "vulnerabilities."
+       elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+       elog "See https://bugs.gentoo.org/752153 for more info"
+}

Reply via email to