summaryrefslogtreecommitdiffstats
path: root/main/go
diff options
context:
space:
mode:
authorEivind Uggedal <eivind@uggedal.com>2014-06-19 05:08:35 +0000
committerEivind Uggedal <eivind@uggedal.com>2014-06-19 05:08:35 +0000
commit406ee1a6c696f0547bbd2a4bbda4811df89cf224 (patch)
treede3f2604bccb0f30b6a758ed1b2a14ea1ac6fa1c /main/go
parentc8df217a529951a4dbf6a98d9e12d3ce8ee9c1c3 (diff)
downloadaports-406ee1a6c696f0547bbd2a4bbda4811df89cf224.tar.bz2
aports-406ee1a6c696f0547bbd2a4bbda4811df89cf224.tar.xz
main/go: upgrade to 1.3
Diffstat (limited to 'main/go')
-rw-r--r--main/go/APKBUILD16
-rw-r--r--main/go/no-longjmp-redefine.patch10
2 files changed, 20 insertions, 6 deletions
diff --git a/main/go/APKBUILD b/main/go/APKBUILD
index 6bfe138b9..b8c6dfaa9 100644
--- a/main/go/APKBUILD
+++ b/main/go/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Eivind Uggedal <eivind@uggedal.com>
pkgname=go
-pkgver=1.2.1
+pkgver=1.3
pkgrel=0
pkgdesc="Go programming language compiler"
url="http://www.golang.org/"
@@ -17,15 +17,16 @@ subpackages="
$pkgname-vim:vim
"
source="
- http://go.googlecode.com/files/go${pkgver}.src.tar.gz
+ http://golang.org/dl/go${pkgver}.src.tar.gz
no-werror.patch
no-pic.patch
+ no-longjmp-redefine.patch
default-sc-getpw-r-size-max.patch
"
_builddir="$srcdir"/$pkgname
_toolrepo=code.google.com/p/go.tools
-_tooltag=release-branch.go1.2
+_tooltag=release-branch.go1.3
prepare() {
local i
@@ -137,15 +138,18 @@ vim() {
done
}
-md5sums="6232fa4417004fc9dde823ad1eaf597c go1.2.1.src.tar.gz
+md5sums="4b66d7249554181c314f139ea78920b1 go1.3.src.tar.gz
65330c61f6d6c881033b0a95ca228edb no-werror.patch
4391be88ce8bacdd7fee433b39635583 no-pic.patch
+93ad940db4a6d51e086f80755eaa8f53 no-longjmp-redefine.patch
2576180fb906455bb786ca2937bbe180 default-sc-getpw-r-size-max.patch"
-sha256sums="1655a9367bec083df57cacc29add280c279791801e102fd851c00d8babd12a55 go1.2.1.src.tar.gz
+sha256sums="eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 go1.3.src.tar.gz
65d38b9485da2ff9417a2c44a81b6e52cc9bd2727b27e7add10d48a63805d4a3 no-werror.patch
86fc68a50bc4a9336a003239adf1dcc6d7cabfb9c1bcf09b0d53d09100ceff12 no-pic.patch
+084020e0eb6cb0aceee047bd5962872ed51dbb45465174018d108eb195c26605 no-longjmp-redefine.patch
be711a828ddda89dd28ffc19d88958471c832005f0666a8a28c8838c0082a208 default-sc-getpw-r-size-max.patch"
-sha512sums="814fc4ea0a2ee0cb5eee0a8299c2d40ee7408b3ac5ae9251717aced20a029024c96b89385fb017958b4a79345b8460e11cdd43e97ed1bc15b151485d2229ab40 go1.2.1.src.tar.gz
+sha512sums="342ccad7790ea856315fc1bea1a745a4ceb444f66cd9d2eaa3486d68e431ee99e697f490fb5f33594d59d42d80eec02a04f6cb7726d8709a32115edf18ffe244 go1.3.src.tar.gz
3cf139723e6ff0cbf7aaf76295fe4208f2062f2d4086e36d05cad83919217b5355e0e79b0b515a06a578389301bd07b062cb58b98fc0f9e4badf190cd1c34826 no-werror.patch
a8e95c3c536a30e15b9bad5e623a085c521739639a58ac638679d99413a1bee8823729783123cbe4495ac42822df31f4776f0380a63786b9f4fc73190e012ae5 no-pic.patch
+3a9b665f8fda89729c4c269ea82f82ee515f0026d26f1d51e2cf84054456e394afc14875e7ed29280a12488907d50c70af313e2e4a5b62c328bbade098db9d4d no-longjmp-redefine.patch
9e9a288ff912b57eff250db53891be166376ec3ee11fcde94b49f1ff1c9433ef531d6c12706258a65a8666e11142506ecc3778e4bbf43dbe23afd2492a3a17a4 default-sc-getpw-r-size-max.patch"
diff --git a/main/go/no-longjmp-redefine.patch b/main/go/no-longjmp-redefine.patch
new file mode 100644
index 000000000..36566d7a8
--- /dev/null
+++ b/main/go/no-longjmp-redefine.patch
@@ -0,0 +1,10 @@
+--- a/include/libc.h
++++ b/include/libc.h
+@@ -102,7 +102,6 @@ extern void sysfatal(char*, ...);
+ #define atoll p9atoll
+ #define getenv p9getenv
+ #define getwd p9getwd
+-#define longjmp p9longjmp
+ #undef setjmp
+ #define setjmp p9setjmp
+ #define putenv p9putenv