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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Wed Mar 15 08:12:23 UTC 2017


    Date: Wednesday, March 15, 2017 @ 08:12:22
  Author: bpiotrowski
Revision: 290858

Rewrite PKGBUILD

Modified:
  go/trunk/PKGBUILD

----------+
 PKGBUILD |  211 ++++++++++++++-----------------------------------------------
 1 file changed, 51 insertions(+), 160 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-15 07:57:26 UTC (rev 290857)
+++ PKGBUILD	2017-03-15 08:12:22 UTC (rev 290858)
@@ -1,186 +1,77 @@
 # $Id$
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Maintainer: Pierre Neidhardt <ambrevar at gmail.com>
-# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
-# Contributor: Rémy Oudompheng <remy at archlinux.org>
-# Contributor: Andres Perera <andres87p gmail>
-# Contributor: Matthew Bauer <mjbauer95 at gmail.com>
-# Contributor: Christian Himpel <chressie at gmail.com>
-# Contributor: Mike Rosset <mike.rosset at gmail.com>
-# Contributor: Daniel YC Lin <dlin.tw at gmail.com>
-# Contributor: John Luebs <jkluebs at gmail.com>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 
-pkgname=('go' 'go-tools')
+pkgname=go
 epoch=2
 pkgver=1.8
-pkgrel=1
-arch=('x86_64' 'i686')
+pkgrel=2
+pkgdesc='Core compiler tools for the Go programming language'
+arch=(i686 x86_64)
 url='http://golang.org/'
-license=('BSD')
-makedepends=('inetutils' 'git' 'go')
-options=('!strip' 'staticlibs')
-source=("$pkgname-$pkgver::git+https://go.googlesource.com/go#tag=$pkgname$pkgver")
-md5sums=('SKIP')
-_gourl=golang.org/x/tools/cmd
+license=(BSD)
+makedepends=(git go)
+options=(!strip staticlibs)
+_commit=cd6b6202dd1559b3ac63179b45f1833fcfbe7eca # go1.8
+source=(git+https://go.googlesource.com/go#commit=$_commit
+        0001-time-make-the-ParseInLocation-test-more-robust.patch)
+md5sums=('SKIP'
+         'a9031d2fdd5d0951980db7ffe20afe41')
 
+export GOOS=linux
+case "$CARCH" in
+  x86_64) export GOARCH=amd64 ;;
+  i686) export GOARCH=386 GO386=387 ;;
+esac
+export GOROOT_FINAL=/usr/lib/go
+export GOROOT_BOOTSTRAP=/usr/lib/go
+
+prepare() {
+  cd $pkgname
+
+  # fixes time/format test with tzdata >=2017a
+  patch -p1 -i "$srcdir/0001-time-make-the-ParseInLocation-test-more-robust.patch"
+}
+
 build() {
-  cd "$pkgname-$pkgver/src"
-
-  export GOROOT="$srcdir/$pkgname-$pkgver"
+  export GOROOT="$srcdir/$pkgname"
   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.
-  #
-  # However, exceptions are made for:
-  #  * Chromium, which is not expected to be used on older i686 CPUs
-  #  * Julia, which requires SSE2
-  #
-  # Go is so slow that it is unusable on i686 when SSE2 is not enabled,
-  # so I am also making an exception for Go.
-  #
-  # If you really want to build Go without SSE2 support, just uncomment the
-  # following export and rebuild:
-  #
-  # export GO386=387
-  #
-
-  # Crosscompilation for various platforms. This is not strictly required as the
-  # compiler can generate libraries on the fly. Prebuilding the libs speeds up
-  # crosscompilation time.
-  #
-  # for os in darwin freebsd linux windows; do
-  #   for arch in 386 amd64 arm; do
-  #     export GOOS="$os"
-  #     export GOARCH="$arch"
-  #     bash make.bash --no-clean
-  #   done
-  # done
-
-  export GOOS=linux
-  case "$CARCH" in
-  x86_64) export GOARCH=amd64 ;;
-  i686) export GOARCH=386 ;;
-  esac
-
-  bash make.bash --no-clean
-
-  # System-wide tools
-  for tool in godex godoc goimports gomvpkg gorename gotype; do
-    $GOROOT/bin/go get -d golang.org/x/tools/cmd/$tool
-    $GOROOT/bin/go build -v -x -o $GOPATH/bin/$tool $_gourl/$tool
-  done
-
-  # Distribution tools
-  for tool in benchcmp bundle callgraph digraph eg fiximports guru html2article present ssadump stress stringer ; do
-    $GOROOT/bin/go get -d golang.org/x/tools/cmd/$tool
-    $GOROOT/bin/go build -v -x -o $GOPATH/pkg/tool/${GOOS}_$GOARCH/$tool golang.org/x/tools/cmd/$tool
-  done
+  cd $pkgname/src
+  ./make.bash --no-clean
 }
 
 check() {
-  cd "$pkgname-$pkgver"
-
-  #export GO386=387
-
-  export GOOS=linux
-  case "$CARCH" in
-    x86_64) GOARCH=amd64 ;;
-    i686) GOARCH=386 ;;
-  esac
-
-  export GOROOT="$srcdir/$pkgname-$pkgver"
+  export GOROOT="$srcdir/$pkgname"
   export GOBIN="$GOROOT/bin"
   export PATH="$srcdir/$pkgname-$pkgver/bin:$PATH"
-  export GOROOT_BOOTSTRAP=/usr/lib/go
+  export GO_TEST_TIMEOUT_SCALE=2
 
-  for tool in goimports gomvpkg gorename gotype \
-    benchcmp bundle callgraph digraph eg fiximports guru html2article present ssadump stress stringer; do
-    GOPATH="$srcdir" $GOROOT/bin/go test -v -x $_gourl/$tool
-  done
+  # The cgo_test and race tests fail via run.bash but not if run manually.
+  # Assume that five "failed" messages are okay and just re-run failed tests.
+  cd $pkgname/src
+  ./run.bash --no-rebuild -v -v -v -k |& tee run.log
+  if (( $(grep -c Failed: run.log) != 5 )) && grep -q FAILED run.log; then
+    return 1
+  fi
 
-  # TestSimpleMulticastListener will fail in standard chroot
-  cd src && bash run.bash --no-rebuild || true
+  go tool dist test -v -v -v -run=^cgo_test$
+  go tool dist test -v -v -v -run=^race$
 }
 
-package_go() {
-  pkgdesc='Compiler and tools for the Go programming language from Google'
-  optdepends=('mercurial: for fetching sources from mercurial repositories'
-              'git: for fetching sources from git repositories'
-              'bzr: for fetching sources from bazaar repositories'
-              'subversion: for fetching sources from subversion repositories'
-              'go-tools: doc, goimports, gorename, and other tools.')
+package() {
+  cd $pkgbase
 
-  cd "$pkgname-$pkgver"
+  install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go"
+  cp -a bin pkg src lib "$pkgdir/usr/lib/go"
+  cp -r doc/* "$pkgdir/usr/share/doc/go"
 
-  export GOROOT="$srcdir/$pkgname-$pkgver"
-  export GOBIN="$GOROOT/bin"
-  export GOROOT_BOOTSTRAP=/usr/lib/go
+  ln -sf /usr/lib/go/bin/go "$pkgdir/usr/bin/go"
+  ln -sf /usr/lib/go/bin/gofmt "$pkgdir/usr/bin/gofmt"
 
-  case "$CARCH" in
-  x86_64) GOARCH=amd64 ;;
-  i686) GOARCH=386 ;;
-  esac
-
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/go/LICENSE"
-
-  mkdir -p "$pkgdir/usr/"{share/go,lib/go,lib/go/pkg,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"
-  cp -a bin "$pkgdir/usr"
-  cp -a pkg/{include,linux_$GOARCH,tool} "$pkgdir/usr/lib/go/pkg"
-  # The 'race' folder is not always generated for all architectures.
-  [ -d "pkg/linux_${GOARCH}_race" ] && cp -a pkg/linux_${GOARCH}_race "$pkgdir/usr/lib/go/pkg"
-  cp -a "$GOROOT/src" "$pkgdir/usr/lib/go/"
-  cp -a "$GOROOT/lib" "$pkgdir/usr/lib/go/"
-
-  # This is to make `# go get golang.org/x/tour/gotour` and then running the
-  # gotour executable work out of the box.
-  ln -sf /usr/bin "$pkgdir/usr/lib/go/bin"
-
   install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
 
-  # For godoc command
-  install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico"
-
-  # Clean Windows specific files.
-  rm -fv "$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/tool/linux_$GOARCH"/*; do
-      strip -s "$i"
-  done
+  rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap"
+  rm -rf "$pkgdir/usr/lib/go/pkg/tool/*/api"
 }
-
-package_go-tools() {
-  pkgdesc='Developer tools for the Go programming language (includes godoc)'
-  depends=('go')
-
-  GOOS=linux
-  case "$CARCH" in
-  x86_64) GOARCH=amd64 ;;
-  i686) GOARCH=386 ;;
-  esac
-
-  install -Dm644 "$srcdir/src/$_gourl/../LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  # System-wide tools
-  install -dm755 "$pkgdir/usr/bin"
-  install -p -m755 "$srcdir/bin"/* "$pkgdir/usr/bin"
-
-  # Distribution tools
-  install -dm755 "$pkgdir/usr/lib/go/pkg/tool/${GOOS}_$GOARCH"
-  install -p -m755 "$srcdir/pkg/tool/${GOOS}_$GOARCH"/* "$pkgdir/usr/lib/go/pkg/tool/${GOOS}_$GOARCH"
-
-  for i in "$pkgdir/usr/bin"/* \
-           "$pkgdir/usr/lib/go/pkg/tool/linux_$GOARCH"/*; do
-    strip -s "$i"
-  done
-}
-
-# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list