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

[Alexander Rødseth]

    Date: Thursday, August 20, 2015 @ 17:46:29
  Author: arodseth
Revision: 138558

upgpkg: go 2:1.5-1

Modified:
  go/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-20 15:20:33 UTC (rev 138557)
+++ PKGBUILD	2015-08-20 15:46:29 UTC (rev 138558)
@@ -11,13 +11,13 @@
 
 pkgname=go
 epoch=2
-pkgver=1.4.2
-pkgrel=2
+pkgver=1.5
+pkgrel=1
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
 url='http://golang.org/'
 license=('BSD')
-makedepends=('inetutils' 'git' 'mercurial')
+makedepends=('inetutils' 'git' 'mercurial' 'go')
 options=('!strip' 'staticlibs')
 optdepends=('mercurial: for fetching sources from mercurial repositories'
             'git: for fetching sources from git repositories'
@@ -34,6 +34,7 @@
   export GOBIN="$GOROOT/bin"
   export GOPATH="$srcdir/"
   export GOROOT_FINAL=/usr/lib/go
+  export GOROOT_BOOTSTRAP=/usr/lib/go
 
   #
   # Arch Linux normally does not enable SSE2 for i686 because of older CPUs.
@@ -95,6 +96,7 @@
   export GOROOT="$srcdir/$pkgname-$pkgver"
   export GOBIN="$GOROOT/bin"
   export PATH="$srcdir/$pkgname-$pkgver/bin:$PATH"
+  export GOROOT_BOOTSTRAP=/usr/lib/go
 
   # TestSimpleMulticastListener will fail in standard chroot
   cd src && bash run.bash --no-rebuild || true
@@ -105,6 +107,7 @@
 
   export GOROOT="$srcdir/$pkgname-$pkgver"
   export GOBIN="$GOROOT/bin"
+  export GOROOT_BOOTSTRAP=/usr/lib/go
 
   install -Dm755 "$srcdir/godoc" "$pkgdir/usr/bin/godoc"
 
@@ -120,9 +123,9 @@
   cp -a pkg "$pkgdir/usr/lib/go"
   cp -a "$GOROOT/src" "$pkgdir/usr/lib/go/"
   cp -a "$GOROOT/src/cmd" "$pkgdir/usr/lib/go/src/cmd"
-  cp -a "$GOROOT/src/lib9" "$pkgdir/usr/lib/go/src/"
+  #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/"
+  #cp -a "$GOROOT/include" "$pkgdir/usr/lib/go/"
 
   install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src"
 
@@ -136,10 +139,10 @@
   find "$pkgdir/usr/lib/go/src" -type f -executable -delete
 
   # Headers for C modules
-  install -Dm644 src/runtime/runtime.h \
-    "$pkgdir/usr/lib/go/src/runtime/runtime.h"
-  install -Dm644 src/runtime/cgocall.h \
-    "$pkgdir/usr/lib/go/src/runtime/cgocall.h"
+  #install -Dm644 src/runtime/runtime.h \
+  #  "$pkgdir/usr/lib/go/src/runtime/runtime.h"
+  #install -Dm644 src/runtime/cgocall.h \
+  #  "$pkgdir/usr/lib/go/src/runtime/cgocall.h"
 
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.