Fri May 10 01:10:30 PDT 2013

1 files changed, 19 insertions, 22 deletions

diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index f2c3a085f..45d62ed28 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89827 2013-05-02 17:23:12Z arodseth $
+# $Id: PKGBUILD 90230 2013-05-09 17:13:58Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -7,8 +7,11 @@
 # Contributor: Christian Himpel <chressie@gmail.com>
 # Contributor: Mike Rosset <mike.rosset@gmail.com>
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
+
+# TODO: Create split packages for the crosscompilation versions as well
+
 pkgname=go
-pkgver=1.1rc1
+pkgver=1.1rc3
 pkgrel=1
 epoch=2
 pkgdesc='Google Go compiler and tools'
@@ -20,17 +23,17 @@ makedepends=('inetutils')
 options=('!strip')
 install="$pkgname.install"
 backup=('usr/lib/go/bin')
-if [ "$CARCH" == 'x86_64' ]; then
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
-          "$pkgname.sh")
-  sha256sums=('fc76b716b031d8afba3f3e6bcaca410e8dbf5fb625db5def00fbaaaa960e108c'
-            'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
-else
+#if [ "$CARCH" == 'x86_64' ]; then
+#  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
+#          "$pkgname.sh")
+#  sha256sums=('ed631dd172418488ee24f79b1aa64474b8eb959f8035c5f2ee77e6d2e467e61a'
+#            'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
+#else
   source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
           "$pkgname.sh")
-  sha256sums=('b4eb8d9b55ae4a78c86213fa968755163ab3a8efa3f5c9f3a472b182b9d9a52e'
-              'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
-fi
+  sha256sums=('c81fd6503ab49ad92a270a740581ad744062c195bec4df94ae9973a9f4001da9'
+            'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
+#fi
 
 build() {
   cd "$srcdir/$pkgname/src"
@@ -42,12 +45,12 @@ build() {
   export GOARCH=arm
   bash make.bash
 
-  # Crosscompilation for other platforms too (including linux i686 and x86_64)
-  for os in linux; do # also possible: darwin freebsd windows
+  # Crosscompilation for various platforms (including linux)
+  for os in linux; do # darwin freebsd windows; do
     for arch in amd64 386; do
-      export GOOS=$os
-      export GOARCH=$arch
-      bash make.bash
+      export GOOS="$os"
+      export GOARCH="$arch"
+      bash make.bash --no-clean
     done
   done
 }
@@ -55,14 +58,11 @@ build() {
 check() {
   cd "$srcdir/$pkgname"
 
-  # Only test for linux and the architecture we're on
   export GOOS=linux
   if [ "$CARCH" == 'x86_64' ]; then
     export GOARCH=amd64
   elif [ "$CARCH" == 'i686' ]; then
     export GOARCH=386
-  else
-    export GOARCH=arm
   fi
 
   export GOROOT="$srcdir/$pkgname"
@@ -135,9 +135,6 @@ package() {
   rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin
 
   install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION
-
-  # Clean up
-  #rm -r "$pkgdir/usr/bin/linux_arm"
 }
 
 # vim:set ts=2 sw=2 et: