git » go-1.20.git » commit 50c17d6

upgpkg: 2:1.4.2-2

author Alexander Rødseth
2015-03-24 16:43:33 UTC
committer Alexander Rødseth
2015-03-24 16:43:33 UTC
parent 2df45a31893067099d4cd6710c45566f621ceddd

upgpkg: 2:1.4.2-2

PKGBUILD +3 -3
go.install +7 -1

diff --git a/PKGBUILD b/PKGBUILD
index eda9196..1fa94e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,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/'
@@ -73,7 +73,7 @@ build() {
 
   $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
@@ -130,7 +130,7 @@ package() {
 
   # 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
 
diff --git a/go.install b/go.install
index d8a228e..3be80f8 100644
--- a/go.install
+++ b/go.install
@@ -8,8 +8,14 @@ post_install() {
   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: