From e17a6648ef57f69d5ae3d86d0e5b3dd3f69cfc05 Mon Sep 17 00:00:00 2001 From: blue-devil Date: Sat, 29 Aug 2020 23:12:19 +0200 Subject: [PATCH] go: ver bump --- programming/language/go/actions.py | 6 +++--- programming/language/go/pspec.xml | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/programming/language/go/actions.py b/programming/language/go/actions.py index 1c403e92a5..cd839efecd 100644 --- a/programming/language/go/actions.py +++ b/programming/language/go/actions.py @@ -15,12 +15,12 @@ def build(): shelltools.export("go_platform","linux-amd64") shelltools.export("go_linker","/lib/ld-linux-x86-64.so.2") - shelltools.export("GOROOT", "%s/go-go1.14.3" % get.workDIR()) #0 + shelltools.export("GOROOT", "%s/go-go%s" % (get.workDIR(), get.srcVERSION())) #0 shelltools.export("GOBIN", "$GOROOT/bin") #1 shelltools.export("GOPATH", "%s" % get.workDIR()) shelltools.export("GOROOT_FINAL", "/usr/lib/go") - shelltools.export("GOROOT_BOOTSTRAP", "%s/go-go1.14.3/go" % get.workDIR()) #2 + shelltools.export("GOROOT_BOOTSTRAP", "%s/go-go%s/go" % (get.workDIR(), get.srcVERSION())) #2 #shelltools.export("GOROOT_BOOTSTRAP", "/usr/lib/go") shelltools.export("GOOS","linux") @@ -32,7 +32,7 @@ def build(): def install(): shelltools.export("GOROOT_FINAL", "/usr/lib/go") - shelltools.cd("%s/go-go1.14.3" % get.workDIR()) + shelltools.cd("%s/go-go%s" % (get.workDIR(), get.srcVERSION())) pisitools.dodir("/usr/lib/go") shelltools.system("cp -r api bin doc lib pkg src %s/usr/lib/go" % get.installDIR()) diff --git a/programming/language/go/pspec.xml b/programming/language/go/pspec.xml index 782e19883c..0680ef2df0 100644 --- a/programming/language/go/pspec.xml +++ b/programming/language/go/pspec.xml @@ -13,10 +13,10 @@ app:console Compiler and tools for the Go programming language from Google Go is an open source programming language that makes it easy to build simple, reliable, and efficient software. - https://github.com/golang/go/archive/go1.14.3.tar.gz + https://github.com/golang/go/archive/go1.15.tar.gz - https://dl.google.com/go/go1.14.3.linux-amd64.tar.gz + https://dl.google.com/go/go1.15.linux-amd64.tar.gz @@ -26,10 +26,10 @@ git - /usr/bin/ - /usr/lib/ - /usr/share/ /etc + /usr/share/ + /usr/lib/ + /usr/bin/