Merge pull request #1287 from ertugerata/master

golang update
This commit is contained in:
Ertuğrul Erata
2016-03-23 20:27:09 +02:00
2 changed files with 22 additions and 12 deletions
+12 -9
View File
@@ -9,7 +9,8 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
from pisi.actionsapi import get from pisi.actionsapi import get
shelltools.export("GOROOT", "%s/go-go1.4.3" % get.workDIR()) shelltools.export("GOROOT_BOOTSTRAP", "/usr/lib/go")
shelltools.export("GOROOT", "%s/go-go1.6" % get.workDIR())
shelltools.export("GOBIN", "$GOROOT/bin") shelltools.export("GOBIN", "$GOROOT/bin")
shelltools.export("GOPATH", "%s" % get.workDIR()) shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("GOROOT_FINAL", "/usr/lib/go") shelltools.export("GOROOT_FINAL", "/usr/lib/go")
@@ -17,29 +18,31 @@ shelltools.export("GOROOT_FINAL", "/usr/lib/go")
shelltools.export("GOOS","linux") shelltools.export("GOOS","linux")
shelltools.export("GOARCH","amd64") shelltools.export("GOARCH","amd64")
pisitools.cxxflags.add("-fpic")
NoStrip=["/"] NoStrip=["/"]
def build(): def build():
shelltools.cd("src") shelltools.cd("src")
shelltools.system("bash make.bash") shelltools.system("bash make.bash")
shelltools.cd("%s/go-go1.4.3" % get.workDIR()) shelltools.cd("%s/go-go1.6" % get.workDIR())
shelltools.system("$GOROOT/bin/go get -d golang.org/x/tools/cmd/godoc") #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") #shelltools.system("$GOROOT/bin/go build -o $GOPATH/godoc golang.org/x/tools/cmd/godoc")
for tool in ["cover", "vet", "callgraph"]: 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 get -d golang.org/x/tools/cmd/%s" % tool)
shelltools.system("$GOROOT/bin/go build -o $GOROOT/pkg/tool/$GOOS\_$GOARCH/%s golang.org/x/tools/cmd/%s" % (tool, 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(): def install():
shelltools.cd("%s/go-go1.4.3" % get.workDIR()) shelltools.cd("%s/go-go1.6" % get.workDIR())
pisitools.dobin("bin/*") pisitools.dobin("bin/*")
pisitools.dodir("/usr/lib/go") pisitools.dodir("/usr/lib/go")
pisitools.insinto("/usr/lib/go", "doc") pisitools.insinto("/usr/lib/go", "doc")
pisitools.insinto("/usr/lib/go", "include") #pisitools.insinto("/usr/lib/go", "include")
pisitools.insinto("/usr/lib/go", "lib") pisitools.insinto("/usr/lib/go", "lib")
pisitools.insinto("/usr/lib/go", "pkg") pisitools.insinto("/usr/lib/go", "pkg")
pisitools.insinto("/usr/lib/go", "src") pisitools.insinto("/usr/lib/go", "src")
@@ -47,4 +50,4 @@ def install():
pisitools.dosym("/usr/bin/go","/usr/lib/go/bin/go") pisitools.dosym("/usr/bin/go","/usr/lib/go/bin/go")
pisitools.dosym("/usr/bin/gofmt","/usr/lib/go/bin/gofmt") pisitools.dosym("/usr/bin/gofmt","/usr/lib/go/bin/gofmt")
pisitools.dodoc("VERSION", "LICENSE", "PATENTS", "README", "AUTHORS", "CONTRIBUTORS") pisitools.dodoc("VERSION", "LICENSE", "PATENTS", "README*", "AUTHORS", "CONTRIBUTORS")
+9 -2
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
@@ -13,13 +12,14 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Compiler and tools for the Go programming language from Google</Summary> <Summary>Compiler and tools for the Go programming language from Google</Summary>
<Description>Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.</Description> <Description>Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.</Description>
<Archive sha1sum="fc5b37f07357ad2672db4b893529d627b24e3889" type="targz">https://github.com/golang/go/archive/go1.4.3.tar.gz</Archive> <Archive sha1sum="26efe56b3602ecf52a33060e74b0d44d26269c6f" type="targz">https://github.com/golang/go/archive/go1.6.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>perl</Dependency> <Dependency>perl</Dependency>
<Dependency>gawk</Dependency> <Dependency>gawk</Dependency>
<Dependency>mercurial</Dependency> <Dependency>mercurial</Dependency>
<Dependency>glibc-32bit</Dependency> <Dependency>glibc-32bit</Dependency>
<Dependency>git</Dependency> <Dependency>git</Dependency>
<Dependency>golang</Dependency><!-- for bootstrapping-->
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
</Patches> </Patches>
@@ -42,6 +42,13 @@
</Package> </Package>
<History> <History>
<Update release="2">
<Date>2016-03-23</Date>
<Version>1.6</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="1"> <Update release="1">
<Date>2016-01-09</Date> <Date>2016-01-09</Date>
<Version>1.4.3</Version> <Version>1.4.3</Version>