git » go-1.20.git » commit 6bf878f

Fix FS#31804 and FS#31805

author Alexander Rødseth
2012-10-15 00:40:33 UTC
committer Alexander Rødseth
2012-10-15 00:40:33 UTC
parent e3912ed73784adf09827236aedb42d3152681a98

Fix FS#31804 and FS#31805

PKGBUILD +36 -33

diff --git a/PKGBUILD b/PKGBUILD
index 31f4779..89bcbba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,11 @@
 
 pkgname=go
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Google Go compiler and tools'
 arch=('x86_64' 'i686')
-url="http://golang.org/"
+url='http://golang.org/'
 license=('custom')
 depends=('perl' 'gawk')
 makedepends=('inetutils')
@@ -21,7 +21,7 @@ options=('!strip' '!emptydirs')
 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')
 
@@ -35,69 +35,70 @@ build() {
 
   # Set GOARCH to arm for crosscompilation (currently doesn't work)
 
-  cd "$srcdir/$pkgname"
-  export GOROOT_FINAL="/usr/lib/go"
+  cd $srcdir/$pkgname
+  export GOROOT_FINAL=/usr/lib/go
   export GOOS=linux
   cd src
   bash make.bash
 }
 
 check() {
-  cd "$srcdir/$pkgname"
+  cd $srcdir/$pkgname
 
-  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"
+    $pkgdir/usr/share/licenses/go/LICENSE
   install -Dm644 misc/bash/go \
-    "$pkgdir/usr/share/bash-completion/completions/go"
+    $pkgdir/usr/share/bash-completion/completions/go
   install -Dm644 misc/emacs/go-mode-load.el \
-    "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el"
+    $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el
   install -Dm644 misc/emacs/go-mode.el \
-    "$pkgdir/usr/share/emacs/site-lisp/go-mode.el"
+    $pkgdir/usr/share/emacs/site-lisp/go-mode.el
   install -Dm644 misc/zsh/go \
-    "$pkgdir/usr/share/zsh/site-functions/_go"
+    $pkgdir/usr/share/zsh/site-functions/_go
 
   for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \
     ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \
     syntax/go.vim syntax/godoc.vim plugin/godoc.vim;
   do
-    install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f"
+    install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f
   done
 
-  mkdir -p "$pkgdir/"{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
+  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
 
-  cp -r doc misc -t "$pkgdir/usr/share/go"
-  ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc"
-  cp -a bin "$pkgdir/usr"
-  cp -a pkg "$pkgdir/usr/lib/go"
-  cp -a $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/"
-  cp -a $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd"
-  cp -a $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/"
-  cp -a $GOROOT/lib "$pkgdir/usr/lib/go/"
+  cp -r doc misc -t $pkgdir/usr/share/go
+  ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
+  cp -a bin $pkgdir/usr
+  cp -a pkg $pkgdir/usr/lib/go
+  cp -a $GOROOT/src/pkg $pkgdir/usr/lib/go/src/
+  cp -a $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd
+  cp -a $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/
+  cp -a $GOROOT/lib $pkgdir/usr/lib/go/
+  cp -a $GOROOT/include $pkgdir/usr/lib/go/
 
-  install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src"
+  install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
 
   # Remove object files from target src dir
-  find "$pkgdir/usr/lib/go/src/" -type f -name '*.[ao]' -delete
-  find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete
+  find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete
+  find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete
 
   # Headers for C modules
   install -Dm644 src/pkg/runtime/runtime.h \
-    "$pkgdir/usr/lib/go/src/pkg/runtime/runtime.h"
+    $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h
   install -Dm644 src/pkg/runtime/cgocall.h \
-    "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
+    $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
 
   # For packages that source /etc/profile.d/go.sh
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
+  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.
@@ -106,12 +107,14 @@ package() {
   # not /usr/lib/go/bin. Users should use different paths by
   # setting the appropriate environment variables.
   #
-  ln -sf /usr/bin "$pkgdir/usr/lib/go/bin"
+  ln -sf /usr/bin $pkgdir/usr/lib/go/bin
 
   # For godoc
-  install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico"
+  install -Dm644 favicon.ico $pkgdir/usr/lib/go/favicon.ico
 
-  rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin"
+  rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin
+
+  install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION
 }
 
 # vim:set ts=2 sw=2 et: