Skip to content

Commit 486c65f

Browse files
g4s8dkwo
authored andcommitted
go: update to 1.21.5.
fixes #46717 Co-authored-by: dkwo <nicolopiazzalunga@gmail.com>
1 parent 02d0cd4 commit 486c65f

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

srcpkgs/go/template

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'go'
22
pkgname=go
3-
version=1.21.4
3+
version=1.21.5
44
revision=1
55
create_wrksrc=yes
66
build_wrksrc=go
@@ -12,20 +12,26 @@ license="BSD-3-Clause"
1212
homepage="https://go.dev/"
1313
changelog="https://go.dev/doc/devel/release.html"
1414
distfiles="https://go.dev/dl/go${version}.src.tar.gz"
15-
checksum=47b26a83d2b65a3c1c1bcace273b69bee49a7a7b5168a7604ded3d26a37bd787
15+
checksum=285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19
1616
nostrip=yes
1717
noverifyrdeps=yes
1818
# on CI it tries to use `git submodule`, which is not part of chroot-git
1919
make_check=ci-skip
2020

21+
# keep in sync with common/environment/build-style/go.sh
2122
case "${XBPS_TARGET_MACHINE}" in
22-
aarch64*) _goarch=arm64 ;;
23-
arm*) _goarch=arm ;;
24-
i686*) _goarch=386 ;;
25-
x86_64*) _goarch=amd64 ;;
26-
ppc64le*) _goarch=ppc64le ;;
27-
mips*) _goarch=mips ;;
28-
riscv64*) _goarch=riscv64 ;;
23+
aarch64*) export GOARCH=arm64 ;;
24+
armv5*) export GOARCH=arm; export GOARM=5 ;;
25+
armv6*) export GOARCH=arm; export GOARM=6 ;;
26+
armv7*) export GOARCH=arm; export GOARM=7 ;;
27+
i686*) export GOARCH=386 ;;
28+
x86_64*) export GOARCH=amd64 ;;
29+
ppc64le*) export GOARCH=ppc64le ;;
30+
ppc64*) export GOARCH=ppc64 ;;
31+
ppc*) export GOARCH=ppc ;;
32+
mipsel*) export GOARCH=mipsle ;;
33+
mips*) export GOARCH=mips ;;
34+
riscv64*) export GOARCH=riscv64 ;;
2935
*) broken="Unsupported architecture ${XBPS_TARGET_MACHINE}" ;;
3036
esac
3137

@@ -56,7 +62,6 @@ do_build() {
5662

5763
export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
5864
export GOROOT=$PWD
59-
export GOARCH=${_goarch}
6065

6166
cd "src"
6267

@@ -76,7 +81,7 @@ do_install() {
7681
local bindir
7782

7883
if [ "$CROSS_BUILD" ]; then
79-
bindir=bin/linux_${_goarch}
84+
bindir=bin/linux_${GOARCH}
8085
else
8186
bindir=bin
8287
fi
@@ -85,7 +90,7 @@ do_install() {
8590
vmkdir usr/lib/go
8691
vmkdir usr/lib/go/bin
8792
vmkdir usr/share/go
88-
cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
93+
cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin
8994
cp -a pkg src lib ${DESTDIR}/usr/lib/go
9095
cp -r doc misc -t ${DESTDIR}/usr/share/go
9196
ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc

0 commit comments

Comments
 (0)