community/go to 1.14.3-1

community/go/PKGBUILD

@@ -13,23 +13,25 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - added switches for our architectures
-#  - don't build stdlib with race detector (x86 only)
+#  - don't build stdlib with race detector for 32-bit ARM (not supported)
 
-pkgbase=go
+pkgname=go
-pkgname=(go go-pie)
 epoch=2
-pkgver=1.14.2
+pkgver=1.14.3
 pkgrel=1
+pkgdesc='Core compiler tools for the Go programming language'
 arch=(x86_64)
 url='https://golang.org/'
 license=(BSD)
 makedepends=(git go perl)
-source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz
+replaces=(go-pie)
-        default-buildmode-pie.patch)
+provides=(go-pie)
-sha256sums=('98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c'
+options=(!strip staticlibs)
-            'be1269689de3cf5c926cf7de07f88d2a6d1ecbfc86694baaf5baee3bdcfdd79a')
+source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz{,.asc})
+validpgpkeys=('EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796')
+sha256sums=('93023778d4d1797b7bc6a53e86c3a9b150c923953225f8a48a2d5fabc971af56'
+            'SKIP')
 
-export GOOS=linux
 case "$CARCH" in
   x86_64) export GOARCH=amd64 ;;
   arm) export GOARCH=arm GOARM=5 ;;
@@ -37,45 +39,35 @@ case "$CARCH" in
   armv7h) export GOARCH=arm GOARM=7 ;;
   aarch64) export GOARCH=arm64 ;;
 esac
-export GOROOT_FINAL=/usr/lib/go
-export GOROOT_BOOTSTRAP=/usr/lib/go
-
-prepare() {
-  cp -r $pkgbase $pkgbase-pie
-
-  cd $pkgbase-pie
-  patch -p1 -i "$srcdir/default-buildmode-pie.patch"
-}
 
 build() {
+  export GOROOT_FINAL=/usr/lib/go
+  export GOROOT_BOOTSTRAP=/usr/lib/go
   export GOPATH="$srcdir/"
+  export GOROOT="$srcdir/$pkgname"
+  export GOBIN="$GOROOT/bin"
 
-  for _pkgname in ${pkgname[@]}; do
+  cd "$pkgname/src"
-    export GOROOT="$srcdir/$_pkgname"
+  ./make.bash --no-clean -v
-    export GOBIN="$GOROOT/bin"
 
-    cd "$srcdir/$_pkgname/src"
+  [[ $CARCH == "aarch64" ]] && PATH="$GOBIN:$PATH" go install -v -race std
-    ./make.bash --no-clean -v
+  PATH="$GOBIN:$PATH" go install -v -buildmode=shared std
-
-    PATH="$GOBIN:$PATH" go install -v -buildmode=shared std
-    #PATH="$GOBIN:$PATH" go install -v -race std
-  done
 }
 
 check() {
-  # Run test suite only for unpatched Go as it expects non-PIE ldBuildmode
+  export GOROOT_FINAL=/usr/lib/go
-  export GOROOT="$srcdir/$pkgbase"
+  export GOROOT_BOOTSTRAP=/usr/lib/go
+  export GOROOT="$srcdir/$pkgname"
   export GOBIN="$GOROOT/bin"
-  export PATH="$srcdir/$pkgbase/bin:$PATH"
+  export PATH="$srcdir/$pkgname/bin:$PATH"
   export GO_TEST_TIMEOUT_SCALE=2
 
-  cd $pkgbase/src
+  cd $pkgname/src
   ./run.bash --no-rebuild -v -v -v -k
 }
 
-_package() {
+package() {
-  options=(!strip staticlibs)
+  cd "$pkgname"
-  cd "$srcdir/$1"
 
   install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go"
   cp -a bin pkg src lib misc api test "$pkgdir/usr/lib/go"
@@ -92,26 +84,7 @@ _package() {
   # TODO: Figure out if really needed
   rm -rf "$pkgdir"/usr/lib/go/pkg/obj/go-build/*
 
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$1/LICENSE"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_go() {
-  pkgdesc='Core compiler tools for the Go programming language'
-
-  _package $pkgname
-}
-
-package_go-pie() {
-  pkgdesc='Core compiler tools for the Go programming language (with PIE enabled by default)'
-  provides=("go=$epoch:$pkgver-$pkgrel")
-  conflicts=(go)
-
-  _package $pkgname
-
-  # linux_amd64 is essentially the content of linux_amd64_shared, however there might
-  # be cases where the user could generate the _shared directory as it's missing in go-pie.
-  # Make sure it exists without rebuilding std with -buildmode=pie.
-  cp -a "$pkgdir/usr/lib/go/pkg/linux_${GOARCH}/" "$pkgdir/usr/lib/go/pkg/linux_${GOARCH}_shared"
 }
 
 # vim: ts=2 sw=2 et

community/go/default-buildmode-pie.patch

@@ -1,13 +0,0 @@
-diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go
-index 7f894f5..a517887 100644
---- a/src/cmd/go/internal/work/init.go
-+++ b/src/cmd/go/internal/work/init.go
-@@ -131,7 +131,7 @@ func buildModeInit() {
- 		ldBuildmode = "c-shared"
- 	case "default":
- 		switch cfg.Goos {
--		case "android":
-+		case "android", "linux":
- 			codegenArg = "-shared"
- 			ldBuildmode = "pie"
- 		case "darwin":