Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1712 from ertugerata/master

Browse Source 
golang update and fix docker dependency
This commit is contained in:
Ertuğrul Erata
2016-05-04 21:35:33 +03:00
parent b837f590f5 1c55410def
commit c7117d9398
3 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/docker/pspec.xml
+2 -2
View File
@@ -26,10 +26,10 @@
</Patches> </Patches>
</Source> </Source>
<Package> <Package>
<Name>docker</Name> <Name>docker</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>git</Dependency> <Dependency>git</Dependency>
<Dependency versionFrom="1.4.3">golang</Dependency> <!--Dependency versionFrom="1.4.3">golang</Dependency-->
<Dependency>sqlite</Dependency> <Dependency>sqlite</Dependency>
<Dependency>device-mapper</Dependency> <Dependency>device-mapper</Dependency>
<Dependency>btrfs-progs</Dependency> <Dependency>btrfs-progs</Dependency>
programming/language/go/actions.py
+39 -30
View File
@@ -9,45 +9,54 @@ 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_BOOTSTRAP", "/usr/lib/go") NoStrip = "/"
shelltools.export("GOROOT", "%s/go-go1.6" % get.workDIR())
shelltools.export("GOBIN", "$GOROOT/bin")
shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("GOROOT_FINAL", "/usr/lib/go")
shelltools.export("GOOS","linux")
shelltools.export("GOARCH","amd64")
pisitools.cxxflags.add("-fpic")
NoStrip=["/"]
def build(): def build():
shelltools.cd("src")
shelltools.system("bash make.bash") shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR()) #0
shelltools.export("GOBIN", "$GOROOT/bin") #1
shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.cd("%s/go-go1.6" % get.workDIR()) 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")
#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 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 ["godex", "godoc", "goimports", "gomvpkg", "gorename", "gotype", "benchcmp", "bundle", "callgraph", "digraph", "eg", "fiximports", "html2article", "oracle", "present", "ssadump", "stress", "stringer"]: #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 -v -x -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.6" % get.workDIR()) shelltools.export("GOROOT_FINAL", "/usr/lib/go")
shelltools.cd("%s/go-go1.6.2" % get.workDIR())
pisitools.dobin("bin/*")
pisitools.dodir("/usr/lib/go") pisitools.dodir("/usr/lib/go")
pisitools.insinto("/usr/lib/go", "doc") shelltools.system("cp -rp api bin doc lib pkg src %s/usr/lib/go" % get.installDIR())
#pisitools.insinto("/usr/lib/go", "include") shelltools.system("chown -R root:root %s/usr" % get.installDIR())
pisitools.insinto("/usr/lib/go", "lib")
pisitools.insinto("/usr/lib/go", "pkg") pisitools.dosym("/usr/lib/go/bin/go", "/usr/bin/go")
pisitools.insinto("/usr/lib/go", "src") pisitools.dosym("/usr/lib/go/bin/gofmt", "/usr/bin/gofmt")
pisitools.dosym("/usr/bin/go","/usr/lib/go/bin/go") pisitools.dosym("usr/lib/go/doc", "/usr/share/doc/%s/doc" % get.srcNAME())
pisitools.dosym("/usr/bin/gofmt","/usr/lib/go/bin/gofmt") 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") pisitools.dodoc("VERSION", "LICENSE", "PATENTS", "README*", "AUTHORS", "CONTRIBUTORS")
programming/language/go/pspec.xml
+6 -14
View File
@@ -12,39 +12,31 @@
<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="26efe56b3602ecf52a33060e74b0d44d26269c6f" type="targz">https://github.com/golang/go/archive/go1.6.tar.gz</Archive> <Archive sha1sum="1c7b23001917ba2fdc51d2e35079a851c99ab437" type="targz">https://github.com/golang/go/archive/go1.6.2.tar.gz</Archive>
<BuildDependencies> <Archive sha1sum="97058ade5ad63119f78aa5d1717b1ac26c9f5f7b" type="tarbz2" target="go-go1.6.2">https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap.tbz</Archive>
<!--BuildDependencies>
<Dependency>perl</Dependency> <Dependency>perl</Dependency>
<Dependency>gawk</Dependency> <Dependency>gawk</Dependency>
<Dependency>mercurial</Dependency> <Dependency>mercurial</Dependency>
<Dependency>git</Dependency> <Dependency>git</Dependency>
<Dependency>golang</Dependency><!-- for bootstrapping--> </BuildDependencies-->
</BuildDependencies>
<Patches>
</Patches>
</Source> </Source>
<Package> <Package>
<Name>golang</Name> <Name>golang</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>git</Dependency> <Dependency>git</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/</Path> <Path fileType="executable">/usr/bin/</Path>
<Path fileType="library">/usr/lib/</Path> <Path fileType="library">/usr/lib/</Path>
<Path fileType="config">/etc</Path>
<Path fileType="data">/usr/share/</Path> <Path fileType="data">/usr/share/</Path>
</Files> </Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/profile.d/go.sh">go.sh</AdditionalFile>
</AdditionalFiles>
</Package> </Package>
<History> <History>
<Update release="2"> <Update release="2">
<Date>2016-03-23</Date> <Date>2016-04-26</Date>
<Version>1.6</Version> <Version>1.6.2</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name> <Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email> <Email>ertugrulerata@gmail.com</Email>