diff options
| -rw-r--r-- | development/google-go-lang/google-go-lang.SlackBuild | 19 | ||||
| -rw-r--r-- | development/google-go-lang/google-go-lang.info | 6 | ||||
| -rw-r--r-- | development/google-go-lang/runtime-test-capture.patch | 29 |
3 files changed, 6 insertions, 48 deletions
diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild index 67c8785bac942..82457ae89db63 100644 --- a/development/google-go-lang/google-go-lang.SlackBuild +++ b/development/google-go-lang/google-go-lang.SlackBuild @@ -5,7 +5,7 @@ # Written by Eric Schultz eric at schultzter.ca # Taken over by Vincent Batts vbatts@hashbangbash.com -# Copyright (c) 2012, 2013 Vincent Batts +# Copyright (c) 2012, 2013, 2014, 2015 Vincent Batts # Copyright (c) 2012 Eric Schultz # # Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -27,8 +27,8 @@ # SOFTWARE. PRGNAM=google-go-lang -VERSION=${VERSION:-1.3.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} RELEASE=${RELEASE:-linux} @@ -77,8 +77,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cat $CWD/runtime-test-capture.patch | patch -p1 || exit 1 - export GOSRC="$(pwd)" export GOROOT="$(pwd)" export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go" @@ -101,17 +99,6 @@ fi cd .. -install -Dm644 misc/bash/go $PKG/etc/bash_completion.d/go - -install -Dm644 misc/emacs/go-mode-load.el $PKG/usr/share/emacs/site-lisp/go-mode-load.el -install -Dm644 misc/emacs/go-mode.el $PKG/usr/share/emacs/site-lisp/go-mode.el - -install -Dm644 misc/vim/syntax/go.vim $PKG/usr/share/vim/vimfiles/syntax/go.vim -install -Dm644 misc/vim/ftdetect/gofiletype.vim $PKG/usr/share/vim/vimfiles/ftdetect/gofiletype.vim -install -Dm644 misc/vim/ftplugin/go/fmt.vim $PKG/usr/share/vim/vimfiles/ftplugin/go/fmt.vim -install -Dm644 misc/vim/ftplugin/go/import.vim $PKG/usr/share/vim/vimfiles/ftplugin/go/import.vim -install -Dm644 misc/vim/indent/go.vim $PKG/usr/share/vim/vimfiles/indent/go.vim - ln -sf /usr/lib${LIBDIRSUFFIX}/go/pkg/tool/linux_${GOARCH}/cgo $PKG/usr/bin/cgo ln -sf /usr/lib${LIBDIRSUFFIX}/go/pkg/tool/linux_${GOARCH}/ebnflint $PKG/usr/bin/ebnflint diff --git a/development/google-go-lang/google-go-lang.info b/development/google-go-lang/google-go-lang.info index 2e0e753e85e34..10f51b8163eca 100644 --- a/development/google-go-lang/google-go-lang.info +++ b/development/google-go-lang/google-go-lang.info @@ -1,8 +1,8 @@ PRGNAM="google-go-lang" -VERSION="1.3.3" +VERSION="1.4.2" HOMEPAGE="http://golang.org" -DOWNLOAD="https://storage.googleapis.com/golang/go1.3.3.src.tar.gz" -MD5SUM="2cdbad6baefcf1007f3cf54a5bc878b7" +DOWNLOAD="https://storage.googleapis.com/golang/go1.4.2.src.tar.gz" +MD5SUM="907f85c8fa765d31f7f955836fec4049" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/google-go-lang/runtime-test-capture.patch b/development/google-go-lang/runtime-test-capture.patch deleted file mode 100644 index a24284362bdd6..0000000000000 --- a/development/google-go-lang/runtime-test-capture.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -r 9c4fdd8369ca src/pkg/runtime/crash_cgo_test.go ---- a/src/pkg/runtime/crash_cgo_test.go Mon May 05 10:43:37 2014 -0700 -+++ b/src/pkg/runtime/crash_cgo_test.go Tue May 06 17:21:45 2014 -0400 -@@ -8,6 +8,7 @@ - - import ( - "runtime" -+ "strings" - "testing" - ) - -@@ -21,7 +22,7 @@ - } - got := executeTest(t, cgoSignalDeadlockSource, nil) - want := "OK\n" -- if got != want { -+ if !strings.Contains(got, want) { - t.Fatalf("expected %q, but got %q", want, got) - } - } -@@ -29,7 +30,7 @@ - func TestCgoTraceback(t *testing.T) { - got := executeTest(t, cgoTracebackSource, nil) - want := "OK\n" -- if got != want { -+ if !strings.Contains(got, want) { - t.Fatalf("expected %q, but got %q", want, got) - } - } |