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

[Alexander Rødseth]

    Date: Monday, February 24, 2014 @ 23:37:31
  Author: arodseth
Revision: 106181

Finding a way to install the go tools

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

----------+
 PKGBUILD |   26 ++++++++++++++++----------
 go.sh    |    1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-24 21:03:12 UTC (rev 106180)
+++ PKGBUILD	2014-02-24 22:37:31 UTC (rev 106181)
@@ -17,16 +17,14 @@
 url='http://golang.org/'
 license=('custom')
 depends=('perl' 'gawk')
-makedepends=('inetutils' 'mercurial')
+makedepends=('inetutils' 'mercurial' 'go')
 options=('!strip' 'staticlibs')
 optdepends=('liteide: IDE for editing and building projects written in Go'
             'mercurial: VCS written in Python'
             'git: VCS written in C')
 install="$pkgname.install"
-source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#branch=release-branch.$pkgname$pkgver"
-        "$pkgname.sh")
-md5sums=('SKIP'
-         'e7087d190fd519db3be5adb3a51194cc')
+source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#branch=release-branch.$pkgname$pkgver")
+md5sums=('SKIP')
 
 build() {
   cd "$pkgname-$pkgver/src"
@@ -126,11 +124,6 @@
   install -Dm644 src/pkg/runtime/cgocall.h \
     "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
 
-  # Set GOROOT since /usr/lib/go is not a standard location,
-  # (http://golang.org/doc/install/source) and may also make godoc work
-  # for some instances where it otherwise does not work. (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"
@@ -143,6 +136,19 @@
   install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
 
   find "$pkgdir/usr/"{lib/go/pkg,bin} -type f -exec touch '{}' +
+
+  # Needed tools
+  if [ "$CARCH" == 'x86_64' ]; then
+    export GOARCH=amd64
+  elif [ "$CARCH" == 'i686' ]; then
+    export GOARCH=386
+  fi
+
+  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/vet
+
+  find "$pkgdir" -name vet
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: go.sh
===================================================================
--- go.sh	2014-02-24 21:03:12 UTC (rev 106180)
+++ go.sh	2014-02-24 22:37:31 UTC (rev 106181)
@@ -1 +0,0 @@
-export GOROOT=/usr/lib/go