[arch-commits] Commit in go/trunk (PKGBUILD go.install)
Alexander Rødseth
arodseth at archlinux.org
Thu Dec 11 22:35:09 UTC 2014
Date: Thursday, December 11, 2014 @ 23:35:08
Author: arodseth
Revision: 123794
upgpkg: go 2:1.4-1
Modified:
go/trunk/PKGBUILD
go/trunk/go.install
------------+
PKGBUILD | 41 +++++++++++++----------------------------
go.install | 9 +++++----
2 files changed, 18 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-11 20:58:39 UTC (rev 123793)
+++ PKGBUILD 2014-12-11 22:35:08 UTC (rev 123794)
@@ -11,14 +11,14 @@
pkgname=go
epoch=2
-pkgver=1.3.3
-pkgrel=2
+pkgver=1.4
+pkgrel=1
pkgdesc='Compiler and tools for the Go programming language from Google'
arch=('x86_64' 'i686')
url='http://golang.org/'
license=('BSD')
depends=('perl' 'gawk')
-makedepends=('inetutils' 'mercurial')
+makedepends=('inetutils' 'mercurial' 'git')
options=('!strip' 'staticlibs')
optdepends=('mercurial: for fetching sources from mercurial repositories'
'git: for fetching sources from git repositories'
@@ -72,11 +72,11 @@
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
+ $GOROOT/bin/go get -d golang.org/x/tools/cmd/godoc
+ $GOROOT/bin/go build -o $srcdir/godoc golang.org/x/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}
+ $GOROOT/bin/go get -d golang.org/x/tools/cmd/${tool}
+ $GOROOT/bin/go build -o $GOROOT/pkg/tool/${GOOS}_${GOARCH}/${tool} golang.org/x/tools/cmd/${tool}
done
}
@@ -110,22 +110,7 @@
install -Dm644 LICENSE \
"$pkgdir/usr/share/licenses/go/LICENSE"
- install -Dm644 misc/bash/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"
- install -Dm644 misc/emacs/go-mode.el \
- "$pkgdir/usr/share/emacs/site-lisp/go-mode.el"
- install -Dm644 misc/zsh/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/import.vim syntax/go.vim syntax/godoc.vim \
- plugin/godoc.vim;
- do
- 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,lib/go/site/src}}
@@ -133,7 +118,7 @@
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" "$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/lib" "$pkgdir/usr/lib/go/"
@@ -148,13 +133,13 @@
find "$pkgdir" -type f -name sql.go -exec chmod -x {} \;
# Remove all executable source files
- find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete
+ find "$pkgdir/usr/lib/go/src" -type f -executable -delete
# Headers for C modules
- install -Dm644 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"
+ 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.
Modified: go.install
===================================================================
--- go.install 2014-12-11 20:58:39 UTC (rev 123793)
+++ go.install 2014-12-11 22:35:08 UTC (rev 123794)
@@ -10,13 +10,14 @@
echo ' export PATH=$PATH:~/go/bin'
echo ' go get code.google.com/p/go-tour/gotour'
echo
- ####
- post_upgrade
}
post_upgrade() {
- # See FS#41561
- go install std
+ echo
+ echo 'Shell and editor configuration has been removed from the go'
+ echo 'package for the 1.4 release. For more information, see:'
+ echo 'https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins'
+ echo
}
# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list