[arch-commits] Commit in go/trunk (PKGBUILD go.install)

[Alexander Rødseth]

    Date: Tuesday, March 24, 2015 @ 17:43:33
  Author: arodseth
Revision: 129852

upgpkg: go 2:1.4.2-2

Modified:
  go/trunk/PKGBUILD
  go/trunk/go.install

------------+
 PKGBUILD   |    6 +++---
 go.install |    8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-24 15:50:17 UTC (rev 129851)
+++ PKGBUILD	2015-03-24 16:43:33 UTC (rev 129852)
@@ -12,7 +12,7 @@
 pkgname=go
 epoch=2
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
 url='http://golang.org/'
@@ -74,7 +74,7 @@
 
   $GOROOT/bin/go get -d golang.org/x/tools/cmd/godoc
   $GOROOT/bin/go build -o $srcdir/godoc golang.org/x/tools/cmd/godoc
-  for tool in vet cover; do
+  for tool in vet cover callgraph; do
     $GOROOT/bin/go get -d golang.org/x/tools/cmd/${tool}
     $GOROOT/bin/go build -o $GOROOT/pkg/tool/${GOOS}_${GOARCH}/${tool} golang.org/x/tools/cmd/${tool}
   done
@@ -131,7 +131,7 @@
 
   # Fix for FS#32813
   find "$pkgdir" -type f -name sql.go -exec chmod -x {} \;
-  
+
   # Remove all executable source files
   find "$pkgdir/usr/lib/go/src" -type f -executable -delete
 

Modified: go.install
===================================================================
--- go.install	2015-03-24 15:50:17 UTC (rev 129851)
+++ go.install	2015-03-24 16:43:33 UTC (rev 129852)
@@ -8,8 +8,14 @@
   echo '    mkdir ~/go'
   echo '    export GOPATH=~/go'
   echo '    export PATH=$PATH:~/go/bin'
-  echo '    go get code.google.com/p/go-tour/gotour'
+  echo '    go get golang.org/x/tour/gotour'
   echo
+  post_upgrade
 }
 
+post_upgrade() {
+  # This is needed to avoid problems like FS#41561 and FS#44099
+  go install std 2> /dev/null || return 0
+}
+
 # vim:set ts=2 sw=2 et: