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

[Alexander Rødseth]

    Date: Wednesday, February 6, 2013 @ 14:13:24
  Author: arodseth
Revision: 83898

Fix for FS#33679

Modified:
  go/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-06 12:43:24 UTC (rev 83897)
+++ PKGBUILD	2013-02-06 13:13:24 UTC (rev 83898)
@@ -10,10 +10,10 @@
 
 pkgname=go
 pkgver=1.0.3
-pkgrel=5
+pkgrel=6
 epoch=2
 pkgdesc='Google Go compiler and tools'
-arch=('x86_64' 'i686' 'armv6h')
+arch=('x86_64' 'i686')
 url='http://golang.org/'
 license=('custom')
 depends=('perl' 'gawk')
@@ -22,12 +22,12 @@
 install=go.install
 backup=('usr/lib/go/bin')
 source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
-        $pkgname.sh)
+        "$pkgname.sh")
 sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df'
             'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892')
 
 build() {
-  cd $srcdir/$pkgname
+  cd "$srcdir/$pkgname"
 
   if [ "$CARCH" == 'x86_64' ]; then
     export GOARCH=amd64
@@ -52,7 +52,7 @@
 }
 
 check() {
-  cd $srcdir/$pkgname
+  cd "$srcdir/$pkgname"
 
   if [ "$CARCH" == 'x86_64' ]; then
     export GOARCH=amd64
@@ -62,15 +62,15 @@
     export GOARCH=arm
   fi
 
-  export GOROOT=$srcdir/$pkgname
-  export PATH=$srcdir/$pkgname/bin:$PATH
+  export GOROOT="$srcdir/$pkgname"
+  export PATH="$srcdir/$pkgname/bin:$PATH"
 
   # TestSimpleMulticastListener will fail in standard chroot.
   cd src && bash run.bash --no-rebuild || true
 }
 
 package() {
-  cd $srcdir/$pkgname
+  cd "$srcdir/$pkgname"
 
   install -Dm644 LICENSE \
     $pkgdir/usr/share/licenses/go/LICENSE
@@ -106,8 +106,10 @@
 
   # Remove object files from target src dir
   find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete
+
   # 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/pkg -type f -executable -delete
 
@@ -130,6 +132,9 @@
   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: