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

[Alexander Rødseth]

    Date: Saturday, September 12, 2015 @ 11:02:09
  Author: arodseth
Revision: 139960

upgpkg: go 2:1.5.1-1

Modified:
  go/trunk/PKGBUILD

----------+
 PKGBUILD |   51 ++++++++++++++++++---------------------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-12 08:14:39 UTC (rev 139959)
+++ PKGBUILD	2015-09-12 09:02:09 UTC (rev 139960)
@@ -8,16 +8,17 @@
 # Contributor: Mike Rosset <mike.rosset at gmail.com>
 # Contributor: Daniel YC Lin <dlin.tw at gmail.com>
 # Contributor: John Luebs <jkluebs at gmail.com>
+# Contributor: Pierre Neidhardt <ambrevar at gmail.com>
 
 pkgname=go
 epoch=2
-pkgver=1.5
+pkgver=1.5.1
 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' 'go')
+makedepends=('inetutils' 'git' 'go')
 options=('!strip' 'staticlibs')
 optdepends=('mercurial: for fetching sources from mercurial repositories'
             'git: for fetching sources from git repositories'
@@ -52,15 +53,9 @@
   # export GO386=387
   #
 
-  # Enable ARM crosscompilation for linux
-  export GOOS=linux
-  export GOARCH=arm
-
-  bash make.bash
-
   # Crosscompilation for various platforms (including linux)
   for os in linux; do # darwin freebsd windows; do
-    for arch in amd64 386; do
+    for arch in amd64; do # 386 arm; do
       export GOOS="$os"
       export GOARCH="$arch"
       bash make.bash --no-clean
@@ -87,11 +82,10 @@
   #export GO386=387
 
   export GOOS=linux
-  if [ "$CARCH" == 'x86_64' ]; then
-    export GOARCH=amd64
-  elif [ "$CARCH" == 'i686' ]; then
-    export GOARCH=386
-  fi
+  case "$CARCH" in
+    x86_64) GOARCH=amd64 ;;
+    i686) GOARCH=386 ;;
+  esac
 
   export GOROOT="$srcdir/$pkgname-$pkgver"
   export GOBIN="$GOROOT/bin"
@@ -115,7 +109,7 @@
     "$pkgdir/usr/share/licenses/go/LICENSE"
 
   mkdir -p \
-    "$pkgdir/"{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site/src}}
+    "$pkgdir/usr/"{share/go,lib/go,lib/go/src,lib/go/site/src}
 
   cp -r doc misc -t "$pkgdir/usr/share/go"
   ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc"
@@ -122,37 +116,28 @@
   cp -a bin "$pkgdir/usr"
   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/lib" "$pkgdir/usr/lib/go/"
 
-  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
-
-  # 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" -type f -executable -delete
-
   # 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"
 
-  # For FS#42660 / FS#42661 / gox
-  install -Dm755 src/make.bash "$pkgdir/usr/lib/go/src/make.bash"
-  install -Dm755 src/run.bash "$pkgdir/usr/lib/go/src/run.bash"
   cp -r misc/ "$pkgdir/usr/lib/go/"
 
   # For godoc
   install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico"
 
-  rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin"
-
   install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
 
-  find "$pkgdir/usr/"{lib/go/pkg,bin} -type f -exec touch '{}' +
+  # Clean Windows specific files.
+  rm -f "$pkgdir"/usr/lib/go/src/*.bat
+
+  # Strip manually since `strip` will not process Go's static libraries.
+  for i in "$pkgdir/usr/bin/"* \
+             "$pkgdir/usr/lib/go/pkg/bootstrap/bin/"* \
+             "$pkgdir/usr/lib/go/pkg/tool/linux_amd64/"*; do
+    strip -s "$i"
+  done
 }
 
 # vim:set ts=2 sw=2 et: