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

[Alexander Rødseth]

    Date: Tuesday, February 18, 2014 @ 20:29:43
  Author: arodseth
Revision: 105904

Hopefully a fix for both FS#38860 and FS#38597

Will test more before pushing

Added:
  go/trunk/go.sh
Modified:
  go/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++++++++++++-----
 go.sh    |    1 +
 2 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-18 17:27:03 UTC (rev 105903)
+++ PKGBUILD	2014-02-18 19:29:43 UTC (rev 105904)
@@ -10,7 +10,7 @@
 
 pkgname=go
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 epoch=2
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
@@ -24,11 +24,15 @@
 backup=('usr/lib/go/bin')
 
 if [ "$CARCH" == 'x86_64' ]; then
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz")
-  sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2')
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
+          'go.sh')
+  sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2'
+              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
 else
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz")
-  sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651')
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
+          'go.sh')
+  sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651'
+              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
 fi
 
 build() {
@@ -129,6 +133,9 @@
   install -Dm644 src/pkg/runtime/cgocall.h \
     "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
 
+  # In order to make godoc work, see FS#38597
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
+
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.
   ln -sf /usr/bin "$pkgdir/usr/lib/go/bin"
@@ -141,6 +148,16 @@
   install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
 
   find "$pkgdir/usr/"{lib/go/pkg,bin} -type f -exec touch '{}' +
+
+  # Adding useful go tools (FS#38860)
+  go get code.google.com/p/go.tools/cmd/benchcmp
+  go get code.google.com/p/go.tools/cmd/cover
+  go get code.google.com/p/go.tools/cmd/godoc
+  go get code.google.com/p/go.tools/cmd/goimports
+  go get code.google.com/p/go.tools/cmd/gotype
+  go get code.google.com/p/go.tools/cmd/html2article
+  go get code.google.com/p/go.tools/cmd/ssadump
+  go get code.google.com/p/go.tools/cmd/vet
 }
 
 # vim:set ts=2 sw=2 et:

Added: go.sh
===================================================================
--- go.sh	                        (rev 0)
+++ go.sh	2014-02-18 19:29:43 UTC (rev 105904)
@@ -0,0 +1 @@
+export GOROOT=/usr/lib/go