Skip to content

Commit

Permalink
go: update to 1.19, add tests
Browse files Browse the repository at this point in the history
A few tests need to be skipped, but otherwise tests run perfectly fine.
  • Loading branch information
subnut committed Aug 6, 2022
1 parent d8c48c4 commit 0e6f563
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
13 changes: 13 additions & 0 deletions srcpkgs/go/files/fix-musl-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/go/src/syscall/syscall_linux_test.go
+++ b/go/src/syscall/syscall_linux_test.go
@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},

- {call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
- {call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
- {call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
-
{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
21 changes: 19 additions & 2 deletions srcpkgs/go/template
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
# Template file for 'go'
pkgname=go
version=1.18.3
version=1.19
revision=1
create_wrksrc=yes
build_wrksrc=go
hostmakedepends="go1.12-bootstrap"
checkdepends="clang gcc-fortran"
short_desc="Go Programming Language"
maintainer="Michael Aldridge <[email protected]>"
license="BSD-3-Clause"
homepage="https://go.dev/"
changelog="https://go.dev/doc/devel/release.html"
distfiles="https://go.dev/dl/go${version}.src.tar.gz"
checksum=0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d
checksum=9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9
nostrip=yes
noverifyrdeps=yes

Expand All @@ -31,12 +32,24 @@ if [ "$CROSS_BUILD" ]; then
fi
fi

post_extract() {
if [ "$XBPS_LIBC" = musl ]; then
patch "$patch_args" <"${FILESDIR}/fix-musl-tests.patch"
fi
}

do_build() {
unset GCC CC CXX LD CFLAGS
# FIXME: work around leaking go build-style vars when built as a
# dependency
unset CGO_CXXFLAGS CGO_CFLAGS CGO_ENABLED

# Workaround for go-1.19 compilation error on i686
# runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
if [ "$_goarch" = 386 ]; then
export CGO_CFLAGS="-fno-stack-protector"
fi

export GOROOT_BOOTSTRAP="/usr/lib/go1.12"
export GOROOT=$PWD
export GOROOT_FINAL="/usr/lib/go"
Expand All @@ -47,6 +60,10 @@ do_build() {
bash make.bash -v
}

do_check() {
./bin/go tool dist test -v -run '!^go_test:(os|cmd/link/internal/ld|net)$'
}

do_install() {
local bindir

Expand Down

0 comments on commit 0e6f563

Please sign in to comment.