Date: Saturday, March 22, 2014 @ 02:23:36 Author: arodseth Revision: 108060
Fix for FS#38860 Modified: go/trunk/PKGBUILD ----------+ PKGBUILD | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-22 00:45:07 UTC (rev 108059) +++ PKGBUILD 2014-03-22 01:23:36 UTC (rev 108060) @@ -7,11 +7,12 @@ # Contributor: Christian Himpel <[email protected]> # Contributor: Mike Rosset <[email protected]> # Contributor: Daniel YC Lin <[email protected]> +# Contributor: John Luebs <[email protected]> pkgname=go +epoch=2 pkgver=1.2.1 pkgrel=2 -epoch=2 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') url='http://golang.org/' @@ -27,8 +28,10 @@ md5sums=('SKIP') build() { - cd "$pkgname-$pkgver/src" + export GOROOT="$srcdir/$pkgname-$pkgver" + cd "$GOROOT/src" + export GOPATH="$srcdir/" export GOROOT_FINAL=/usr/lib/go # @@ -46,22 +49,25 @@ # Crosscompilation for various platforms (including linux) for os in linux; do # darwin freebsd windows; do - for platform in amd64 386; do + for arch in amd64 386; do export GOOS="$os" - export GOARCH="$platform" + export GOARCH="$arch" bash make.bash --no-clean - - if [ $platform$CARCH == amd64x86_64 ]; then - # Many thanks to Daniel YC Lin - ../bin/go get -d code.google.com/p/go.tools/cmd/godoc - ../bin/go build -o "$srcdir/godoc" code.google.com/p/go.tools/cmd/godoc - ../bin/go get -d code.google.com/p/go.tools/cmd/vet - ../bin/go build -o ../pkg/tool/$platform/vet code.google.com/p/go.tools/cmd/vet - ../bin/go get -d code.google.com/p/go.tools/cmd/lint - ../bin/go build -o ../pkg/tool/$platform/lint code.google.com/p/go.tools/cmd/lint - fi done done + + GOOS=linux + case "$CARCH" in + x86_64) GOARCH=amd64 ;; + i686) GOARCH=386 ;; + esac + + $GOROOT/bin/go get -d code.google.com/p/go.tools/cmd/godoc + $GOROOT/bin/go build -o $srcdir/godoc code.google.com/p/go.tools/cmd/godoc + for tool in vet cover; do + $GOROOT/bin/go get -d code.google.com/p/go.tools/cmd/${tool} + $GOROOT/bin/go build -o $GOROOT/pkg/tool/${GOOS}_${GOARCH}/${tool} code.google.com/p/go.tools/cmd/${tool} + done } check() { @@ -85,12 +91,9 @@ package() { cd "$pkgname-$pkgver" - export GOROOT="$srcdir/$pkgname-$pkgver" - if [ -e ../godoc ]; then - install -Dm755 ../godoc "$pkgdir/usr/bin/godoc" - fi + install -Dm755 $srcdir/godoc $pkgdir/usr/bin/godoc install -Dm644 LICENSE \ "$pkgdir/usr/share/licenses/go/LICENSE"
