diff options
Diffstat (limited to 'main/go')
| -rw-r--r-- | main/go/APKBUILD | 60 | ||||
| -rw-r--r-- | main/go/default-sc-getpw-r-size-max.patch | 4 |
2 files changed, 21 insertions, 43 deletions
diff --git a/main/go/APKBUILD b/main/go/APKBUILD index 046f5d8ea0..c9cc1e32a5 100644 --- a/main/go/APKBUILD +++ b/main/go/APKBUILD @@ -1,21 +1,17 @@ # Maintainer: Eivind Uggedal <eivind@uggedal.com> pkgname=go -pkgver=1.3.3 -pkgrel=1 +pkgver=1.4.2 +pkgrel=0 pkgdesc="Go programming language compiler" url="http://www.golang.org/" arch="x86 x86_64 armhf" license="BSD" depends="" depends_dev="" -makedepends="bash perl mercurial" +makedepends="bash perl git" options="!strip" install="" -subpackages=" - $pkgname-tools:tools - $pkgname-bash-completion:completion - $pkgname-vim:vim - " +subpackages="$pkgname-tools:tools" source=" http://golang.org/dl/go${pkgver}.src.tar.gz no-werror.patch @@ -26,8 +22,8 @@ source=" " _builddir="$srcdir"/$pkgname -_toolrepo=code.google.com/p/go.tools -_tooltag=release-branch.go1.3 +_toolrepo=golang.org/x/tools +_tooltag=release-branch.go${pkgver%.*} prepare() { local i @@ -63,11 +59,11 @@ build() { #PATH="$GOROOT/bin:$PATH" ./run.bash --no-rebuild --banner || return 1 # Build tools provided with the upstream binary distribution: - "$GOROOT"/bin/go get -d $_toolrepo/... + "$GOROOT"/bin/go get -d $_toolrepo/... || reteurn 1 ( cd "$srcdir"/src/$_toolrepo - hg update $_tooltag - ) + git checkout -b $_tooltag origin/$_tooltag + ) || return 1 local tool for tool in cover vet godoc; do "$GOROOT"/bin/go install $_toolrepo/cmd/$tool @@ -91,8 +87,10 @@ package() { # When this is resolved we can split out the source to a # go-doc sub package. install -dm755 "$pkgdir"/usr/lib/go/src - for d in pkg cmd; do - cp -a src/$d "$pkgdir"/usr/lib/go/src + for p in src/*; do + if [ -d "$p" ]; then + cp -r $p "$pkgdir"/usr/lib/go/src + fi done } @@ -120,41 +118,21 @@ tools() { done } -completion() { - pkgdesc="Bash completion script for Go" - arch="noarch" - - install -Dm644 "$_builddir"/misc/bash/$pkgname \ - "$subpkgdir"/usr/share/bash-completion/completions/$pkgname -} - -vim() { - local f - - pkgdesc="Vim syntax for Go" - arch="noarch" - - for f in ftdetect/gofiletype.vim syntax/go.vim indent/go.vim; do - install -Dm644 "$_builddir"/misc/vim/$f \ - "$subpkgdir"/usr/share/vim/vimfiles/$f - done -} - -md5sums="2cdbad6baefcf1007f3cf54a5bc878b7 go1.3.3.src.tar.gz +md5sums="907f85c8fa765d31f7f955836fec4049 go1.4.2.src.tar.gz 65330c61f6d6c881033b0a95ca228edb no-werror.patch 4391be88ce8bacdd7fee433b39635583 no-pic.patch 93ad940db4a6d51e086f80755eaa8f53 no-longjmp-redefine.patch 81ac9f3188df7a0c16c52cc4d8cc1ffa fix-arm-hackery.patch -2576180fb906455bb786ca2937bbe180 default-sc-getpw-r-size-max.patch" -sha256sums="1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff go1.3.3.src.tar.gz +fd4d1a7ccb5d37da4ff9c3a2d97aa976 default-sc-getpw-r-size-max.patch" +sha256sums="299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b go1.4.2.src.tar.gz 65d38b9485da2ff9417a2c44a81b6e52cc9bd2727b27e7add10d48a63805d4a3 no-werror.patch 86fc68a50bc4a9336a003239adf1dcc6d7cabfb9c1bcf09b0d53d09100ceff12 no-pic.patch 084020e0eb6cb0aceee047bd5962872ed51dbb45465174018d108eb195c26605 no-longjmp-redefine.patch fced8436d9c32a43a5cc87f2243529e7a8209ba73a9afd4fd7733245bc55e4e3 fix-arm-hackery.patch -be711a828ddda89dd28ffc19d88958471c832005f0666a8a28c8838c0082a208 default-sc-getpw-r-size-max.patch" -sha512sums="159872b7764986eba6641a5ebaf3aed3d6066bcd384672068354359099e52035b25bc819582d022ef8d7d91e244269cb38917e13c4d3eac8581831d41b2bac2b go1.3.3.src.tar.gz +3757d5f7c4e6d3b2fed4b01c7da6e3e8c0b7789333219ab10ec0b151fb163980 default-sc-getpw-r-size-max.patch" +sha512sums="cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c go1.4.2.src.tar.gz 3cf139723e6ff0cbf7aaf76295fe4208f2062f2d4086e36d05cad83919217b5355e0e79b0b515a06a578389301bd07b062cb58b98fc0f9e4badf190cd1c34826 no-werror.patch a8e95c3c536a30e15b9bad5e623a085c521739639a58ac638679d99413a1bee8823729783123cbe4495ac42822df31f4776f0380a63786b9f4fc73190e012ae5 no-pic.patch 3a9b665f8fda89729c4c269ea82f82ee515f0026d26f1d51e2cf84054456e394afc14875e7ed29280a12488907d50c70af313e2e4a5b62c328bbade098db9d4d no-longjmp-redefine.patch 573146b72c980af5e41540fd7912b5579b050e41ac9d808e8d14268cf0a0fa1a70e6fade85011c0f18f1a428bc95b225d8b8345be1c50656dc69046ef1eb0b40 fix-arm-hackery.patch -9e9a288ff912b57eff250db53891be166376ec3ee11fcde94b49f1ff1c9433ef531d6c12706258a65a8666e11142506ecc3778e4bbf43dbe23afd2492a3a17a4 default-sc-getpw-r-size-max.patch" +5de9747fe60bbc60aa8ac9870f397fa8750723f919fea25a6afc22066be45a8ad193f7935d3deacbe85c032be89b8ace0a7e82b6c9981ddaf3b7f6e8d140c61f default-sc-getpw-r-size-max.patch" diff --git a/main/go/default-sc-getpw-r-size-max.patch b/main/go/default-sc-getpw-r-size-max.patch index 48ba01b6f4..f242b5a3cc 100644 --- a/main/go/default-sc-getpw-r-size-max.patch +++ b/main/go/default-sc-getpw-r-size-max.patch @@ -1,5 +1,5 @@ ---- a/src/pkg/os/user/lookup_unix.go -+++ b/src/pkg/os/user/lookup_unix.go +--- a/src/os/user/lookup_unix.go ++++ b/src/os/user/lookup_unix.go @@ -57,6 +57,12 @@ bufSize = 1024 } else { |