From 2663ebd5d2043fbcd187906317c5321f57bacb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Fri, 29 Apr 2016 11:03:43 +0300 Subject: [PATCH 1/4] go update works.... --- programming/language/go/actions.py | 43 +++++++++++++++++++----------- programming/language/go/pspec.xml | 10 +++---- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/programming/language/go/actions.py b/programming/language/go/actions.py index 3e1e553049..5fd1e49d92 100644 --- a/programming/language/go/actions.py +++ b/programming/language/go/actions.py @@ -9,45 +9,58 @@ from pisi.actionsapi import autotools from pisi.actionsapi import shelltools from pisi.actionsapi import get -shelltools.export("GOROOT_BOOTSTRAP", "/usr/lib/go") -shelltools.export("GOROOT", "%s/go-go1.6" % get.workDIR()) +shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR()) shelltools.export("GOBIN", "$GOROOT/bin") shelltools.export("GOPATH", "%s" % get.workDIR()) shelltools.export("GOROOT_FINAL", "/usr/lib/go") +shelltools.export("GOROOT_BOOTSTRAP", "%s/go-go1.6.2/go-linux-amd64-bootstrap" % get.workDIR()) + +shelltools.export("GOHOSTARCH","amd64") +shelltools.export("GOHOSTOS","linux") +shelltools.export("CC", "gcc") shelltools.export("GOOS","linux") shelltools.export("GOARCH","amd64") -pisitools.cxxflags.add("-fpic") +shelltools.export("CC_FOR_TARGET", "gcc") +shelltools.export("CXX_FOR_TARGET", "g++") NoStrip=["/"] def build(): shelltools.cd("src") - shelltools.system("bash make.bash") - shelltools.cd("%s/go-go1.6" % get.workDIR()) + shelltools.system("./make.bash") + + #shelltools.cd("%s/go-go1.6.2" % get.workDIR()) #shelltools.system("$GOROOT/bin/go get -d golang.org/x/tools/cmd/godoc") #shelltools.system("$GOROOT/bin/go build -o $GOPATH/godoc golang.org/x/tools/cmd/godoc") - for tool in ["godex", "godoc", "goimports", "gomvpkg", "gorename", "gotype", "benchcmp", "bundle", "callgraph", "digraph", "eg", "fiximports", "html2article", "oracle", "present", "ssadump", "stress", "stringer"]: - shelltools.system("$GOROOT/bin/go get -d golang.org/x/tools/cmd/%s" % tool) - shelltools.system("$GOROOT/bin/go build -v -x -o $GOROOT/pkg/tool/$GOOS\_$GOARCH/%s golang.org/x/tools/cmd/%s" % (tool, tool)) + #for tool in ["godex", "godoc", "goimports", "gomvpkg", "gorename", "gotype", "benchcmp", "bundle", "callgraph", "digraph", "eg", "fiximports", "html2article", "oracle", #"present", "ssadump", "stress", "stringer"]: + # shelltools.system("$GOROOT/bin/go get -d golang.org/x/tools/cmd/%s" % tool) + # shelltools.system("$GOROOT/bin/go build -v -x -o $GOROOT/pkg/tool/$GOOS\_$GOARCH/%s golang.org/x/tools/cmd/%s" % (tool, tool)) def install(): - shelltools.cd("%s/go-go1.6" % get.workDIR()) - - pisitools.dobin("bin/*") + shelltools.cd("%s/go-go1.6.2" % get.workDIR()) + pisitools.dodir("/usr/lib/go") + pisitools.insinto("/usr/lib/go", "bin") + + pisitools.dosym("/usr/lib/go/bin/go", "/usr/bin/go") + pisitools.dosym("/usr/lib/go/bin/gofmt", "/usr/bin/gofmt") + pisitools.insinto("/usr/lib/go", "doc") - #pisitools.insinto("/usr/lib/go", "include") pisitools.insinto("/usr/lib/go", "lib") pisitools.insinto("/usr/lib/go", "pkg") pisitools.insinto("/usr/lib/go", "src") - - pisitools.dosym("/usr/bin/go","/usr/lib/go/bin/go") - pisitools.dosym("/usr/bin/gofmt","/usr/lib/go/bin/gofmt") + shelltools.chmod("%s/usr/lib/go/bin" % get.installDIR(), 0755) + shelltools.chmod("%s/usr/lib/go/pkg/tool" % get.installDIR(), 0755) + + pisitools.insinto("/usr/lib/go", "misc") + + pisitools.removeDir("/usr/lib/go/pkg/bootstrap") + pisitools.dodoc("VERSION", "LICENSE", "PATENTS", "README*", "AUTHORS", "CONTRIBUTORS") diff --git a/programming/language/go/pspec.xml b/programming/language/go/pspec.xml index 6f74f3d8dd..7784b9c369 100644 --- a/programming/language/go/pspec.xml +++ b/programming/language/go/pspec.xml @@ -12,14 +12,13 @@ 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.6.tar.gz + https://github.com/golang/go/archive/go1.6.2.tar.gz + https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap.tbz perl gawk mercurial - glibc-32bit git - golang @@ -27,7 +26,6 @@ golang - glibc-32bit git @@ -43,8 +41,8 @@ - 2016-03-23 - 1.6 + 2016-04-26 + 1.6.2 Version bump. Ertuğrul Erata ertugrulerata@gmail.com From 727c3135091406aaa2813bddd978843ba8fff805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 3 May 2016 18:35:46 +0300 Subject: [PATCH 2/4] go works... --- programming/language/go/actions.py | 46 +++++++++++++----------------- programming/language/go/pspec.xml | 10 ++----- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/programming/language/go/actions.py b/programming/language/go/actions.py index 5fd1e49d92..1702a50f1a 100644 --- a/programming/language/go/actions.py +++ b/programming/language/go/actions.py @@ -9,25 +9,19 @@ from pisi.actionsapi import autotools from pisi.actionsapi import shelltools from pisi.actionsapi import get -shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR()) -shelltools.export("GOBIN", "$GOROOT/bin") -shelltools.export("GOPATH", "%s" % get.workDIR()) -shelltools.export("GOROOT_FINAL", "/usr/lib/go") -shelltools.export("GOROOT_BOOTSTRAP", "%s/go-go1.6.2/go-linux-amd64-bootstrap" % get.workDIR()) - -shelltools.export("GOHOSTARCH","amd64") -shelltools.export("GOHOSTOS","linux") -shelltools.export("CC", "gcc") - -shelltools.export("GOOS","linux") -shelltools.export("GOARCH","amd64") - -shelltools.export("CC_FOR_TARGET", "gcc") -shelltools.export("CXX_FOR_TARGET", "g++") - NoStrip=["/"] def build(): + + shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR()) #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.6.2/go-linux-amd64-bootstrap" % get.workDIR()) #2 + + shelltools.export("GOOS","linux") + shelltools.export("GOARCH","amd64") + shelltools.cd("src") shelltools.system("./make.bash") @@ -46,20 +40,20 @@ def install(): shelltools.cd("%s/go-go1.6.2" % get.workDIR()) pisitools.dodir("/usr/lib/go") - pisitools.insinto("/usr/lib/go", "bin") - + shelltools.system("cp -rp api bin doc lib pkg src %s/usr/lib/go" % get.installDIR()) + pisitools.dosym("/usr/lib/go/bin/go", "/usr/bin/go") pisitools.dosym("/usr/lib/go/bin/gofmt", "/usr/bin/gofmt") - pisitools.insinto("/usr/lib/go", "doc") - pisitools.insinto("/usr/lib/go", "lib") - pisitools.insinto("/usr/lib/go", "pkg") - pisitools.insinto("/usr/lib/go", "src") + shelltools.system("cp -R doc %s/usr/lib/go" % get.installDIR()) + shelltools.system("cp -R lib %s/usr/lib/go" % get.installDIR()) + shelltools.system("cp -R pkg %s/usr/lib/go" % get.installDIR()) + shelltools.system("cp -R src %s/usr/lib/go" % get.installDIR()) + +# shelltools.chmod("%s/usr/lib/go/bin" % get.installDIR(), 0755) +# shelltools.chmod("%s/usr/lib/go/pkg/tool" % get.installDIR(), 0755) - shelltools.chmod("%s/usr/lib/go/bin" % get.installDIR(), 0755) - shelltools.chmod("%s/usr/lib/go/pkg/tool" % get.installDIR(), 0755) - - pisitools.insinto("/usr/lib/go", "misc") + shelltools.system("cp -a misc %s/usr/lib/go" % get.installDIR()) pisitools.removeDir("/usr/lib/go/pkg/bootstrap") diff --git a/programming/language/go/pspec.xml b/programming/language/go/pspec.xml index 7784b9c369..217d0a187c 100644 --- a/programming/language/go/pspec.xml +++ b/programming/language/go/pspec.xml @@ -14,14 +14,12 @@ 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.6.2.tar.gz https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap.tbz - + golang @@ -31,12 +29,8 @@ /usr/bin/ /usr/lib/ - /etc /usr/share/ - - go.sh - From 710fe4f79faa27f5252e1a37da96dfb0f158b593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 4 May 2016 21:06:17 +0300 Subject: [PATCH 3/4] update --- programming/language/go/actions.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/programming/language/go/actions.py b/programming/language/go/actions.py index 1702a50f1a..d4309ec83a 100644 --- a/programming/language/go/actions.py +++ b/programming/language/go/actions.py @@ -9,14 +9,14 @@ from pisi.actionsapi import autotools from pisi.actionsapi import shelltools from pisi.actionsapi import get -NoStrip=["/"] +NoStrip = "/" def build(): shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR()) #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.6.2/go-linux-amd64-bootstrap" % get.workDIR()) #2 shelltools.export("GOOS","linux") @@ -36,25 +36,27 @@ def build(): # shelltools.system("$GOROOT/bin/go build -v -x -o $GOROOT/pkg/tool/$GOOS\_$GOARCH/%s golang.org/x/tools/cmd/%s" % (tool, tool)) -def install(): +def install(): + shelltools.export("GOROOT_FINAL", "/usr/lib/go") shelltools.cd("%s/go-go1.6.2" % get.workDIR()) pisitools.dodir("/usr/lib/go") shelltools.system("cp -rp api bin doc lib pkg src %s/usr/lib/go" % get.installDIR()) - + shelltools.system("chown -R root:root %s/usr" % get.installDIR()) + pisitools.dosym("/usr/lib/go/bin/go", "/usr/bin/go") pisitools.dosym("/usr/lib/go/bin/gofmt", "/usr/bin/gofmt") - - shelltools.system("cp -R doc %s/usr/lib/go" % get.installDIR()) - shelltools.system("cp -R lib %s/usr/lib/go" % get.installDIR()) - shelltools.system("cp -R pkg %s/usr/lib/go" % get.installDIR()) - shelltools.system("cp -R src %s/usr/lib/go" % get.installDIR()) - -# shelltools.chmod("%s/usr/lib/go/bin" % get.installDIR(), 0755) -# shelltools.chmod("%s/usr/lib/go/pkg/tool" % get.installDIR(), 0755) + + pisitools.dosym("usr/lib/go/doc", "/usr/share/doc/%s/doc" % get.srcNAME()) + pisitools.dosym("usr/lib/go/api", "/usr/share/doc/%s/api" % get.srcNAME()) shelltools.system("cp -a misc %s/usr/lib/go" % get.installDIR()) - + pisitools.removeDir("/usr/lib/go/pkg/bootstrap") - + + # remove testdata, which hit cave fix-linkage + pisitools.remove("/usr/lib/go/src/debug/elf/testdata/gcc-386-freebsd-exec") + pisitools.removeDir("/usr/lib/go/pkg/linux_amd64/internal/syscall/windows") + pisitools.removeDir("/usr/lib/go/pkg/obj") + pisitools.dodoc("VERSION", "LICENSE", "PATENTS", "README*", "AUTHORS", "CONTRIBUTORS") From 06aaae3e7353360db30f2fc0fc5239d74a6ddcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Wed, 4 May 2016 21:30:38 +0300 Subject: [PATCH 4/4] docekr no tneeded golang for builddep. --- hardware/virtualization/docker/pspec.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml index 5f00c97e57..e3ab7ceff9 100644 --- a/hardware/virtualization/docker/pspec.xml +++ b/hardware/virtualization/docker/pspec.xml @@ -26,10 +26,10 @@ - docker + docker git - golang + sqlite device-mapper btrfs-progs