Hello community, here is the log from the commit of package go for openSUSE:Factory checked in at 2012-02-14 11:24:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go (Old) and /work/SRC/openSUSE:Factory/.go.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/go/go.changes 2012-01-25 11:08:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.go.new/go.changes 2012-02-14 11:24:13.000000000 +0100 @@ -1,0 +2,75 @@ +Wed Feb 8 09:00:41 UTC 2012 - [email protected] + +This weekly snapshot includes a re-organization of the Go tools. + +Only the go, godoc, and gofmt tools are installed to $GOROOT/bin (or $GOBIN). +The remainder are installed to $GOROOT/bin/tool. +This puts the lesser-used tools (6g, cgo, govet, etc.) outside the user PATH. +Instead these tools may be called through the go tool with 'go tool command'. +For example, to vet hello.go you would type 'go tool vet hello.go'. +Type 'go tool' see the list of available tools. + +With the move, some tools were given simpler names: + 6cov -> cov + 6nm -> nm + goapi -> api + gofix -> fix + gopack -> pack + gopprof -> pprof + govet -> vet + goyacc -> yacc + +The os/signal package has been moved to exp/signal. + +A new tool named 'dist' has been introduced to handle building the gc +tool chain and to bootstrap the go tool. The old build scripts and make +files have been removed. + +Full list of changes and fixes available: +http://weekly.golang.org/doc/devel/weekly.html#2012-02-07 + +------------------------------------------------------------------- +Mon Feb 6 12:21:45 UTC 2012 - [email protected] + +- Satisfy Factory-Auto (only comment out %path, not Patch) + +------------------------------------------------------------------- +Sun Feb 5 07:24:02 UTC 2012 - [email protected] + +- Update to latest tip +- Now use cmd/dist to build toolchain, build scripts are removed + build process is now as follows. + + build cmd/dist C based bootstrap tool + -> compile C based compilers and Go based bootstrap tool + -> compile Go based core commands and libraries + +- Remove patch that affects, cmd/go/{build,pkg}.go , this command + is under active development and building against binary installs + is slated to be included before Go1 release. + +------------------------------------------------------------------- +Tue Jan 31 09:28:58 UTC 2012 - [email protected] + +- Patch: quick hack to try and get packages building against third + party libs if they are installed as binary archives without source +- Update some spec file entries for changing $GOROOT layout, mainly + $GOROOT/bin/go-tools +- Add $GOBIN back for now + +------------------------------------------------------------------- +Mon Jan 30 09:50:09 UTC 2012 - [email protected] + +- spec tweaks, use default locations for go tooling + (compilers, linkers, cgo etc all in $GOROOT now) +- remove $GOBIN from /etc/profile.d/go.sh + +------------------------------------------------------------------- +Fri Jan 27 10:30:00 UTC 2012 - [email protected] + +- Update to weekly.2012-01-27 +- renamed the html package to exp/html +- Many fixes: + - * http://weekly.golang.org/doc/devel/weekly.html#2012-01-27 + +------------------------------------------------------------------- Old: ---- go-0.0.r60.3+hg20120120.tar.bz2 go-set-make-cmd-install-path-to-gobin.patch New: ---- go-0.0.r60.3+hg20120207.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go.spec ++++++ --- /var/tmp/diff_new_pack.TQdJep/_old 2012-02-14 11:24:16.000000000 +0100 +++ /var/tmp/diff_new_pack.TQdJep/_new 2012-02-14 11:24:16.000000000 +0100 @@ -19,7 +19,7 @@ Name: go -Version: 0.0.r60.3+hg20120120 +Version: 0.0.r60.3+hg20120207 Release: 0 Summary: A compiled, garbage-collected, concurrent programming language License: BSD-3-Clause @@ -36,10 +36,8 @@ Patch1: go-godoc-path-locations.patch # PATCH-FIX-OPENSUSE set correct location of gdb pretty printer Patch2: gdb-printer.patch -# PATCH-FIX-OPENSUSE set correct install path (GOBIN) for Make.cmd -Patch3: go-set-make-cmd-install-path-to-gobin.patch -# PATCH-FIX-OPENSUSE add -s flag to 'go install' (don't rebuild std libs) -Patch4: go-install-dont-rebuild-std-packages.patch +# PATCH-FIX-OPENSUSE add -s flag to 'go install' (don't rebuild/install std libs) +Patch3: go-install-dont-rebuild-std-packages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: ed @@ -97,9 +95,8 @@ %setup -q -n %{name} echo %{url} %patch1 -p1 -%patch2 -p1 +#%%patch2 -p1 %patch3 -p1 -%patch4 -p1 cp %{SOURCE4} . # setup go_arch (BSD-like scheme) @@ -120,8 +117,6 @@ %define gdb_printer %{_libdir}/go/pkg/linux_%{go_arch}/runtime/runtime-gdb.py %build -# Fix GOBIN so that the compiler is not searched in GOROOT/bin -sed -i 's,^GOBIN=.*$,GOBIN=%{_bindir},g' src/Make.inc export GOROOT="`pwd`" export GOBIN="$GOROOT/bin" @@ -129,7 +124,7 @@ cd src export GDB_PRINTER="%{gdb_printer}" # enable compiler inlining -export GCFLAGS=-l +#export GCFLAGS=-l HOST_EXTRA_CFLAGS="%{optflags} -Wno-error -D GDB_PRINTER='\"$GDB_PRINTER\"'" ./make.bash %install @@ -143,32 +138,23 @@ install -Dm644 misc/kate/go.xml %{buildroot}%{_datadir}/kde4/apps/katepart/syntax/go.xml mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir} -cp -r bin/* %{buildroot}%{_bindir} -# all C compilers are now built for generated files, remove them for other archs -rm %{buildroot}%{_bindir}/5c -%ifarch %ix86 -rm %{buildroot}%{_bindir}/6c -%endif -%ifarch x86_64 -rm %{buildroot}%{_bindir}/8c -%endif -mv %{buildroot}%{_bindir}/goinstall %{buildroot}%{_sbindir}/goinstall +mkdir -p $GOROOT/bin/tool +mv bin/tool $GOROOT/bin +mv bin/* %{buildroot}%{_bindir} + rm -f %{buildroot}%{_bindir}/{hgpatch,quietgcc} mkdir -p $GOROOT/src -install -m644 src/Make.{ccmd,clib,cmd,common,inc,pkg} $GOROOT/src # source files for goinstall, godoc, etc install -d %{buildroot}%{_datadir}/go -for ext in *.{go,c,h}; do +for ext in *.{go,c,h,s,S}; do find src -name ${ext} -exec install -Dm644 \{\} %{buildroot}%{_datadir}/go/\{\} \; done ln -s /usr/share/go/src/pkg $GOROOT/src/pkg ln -s /usr/share/go/src/cmd $GOROOT/src/cmd -# replace $GOROOT in several scripts -sed -i 's|GOROOT=.*$|GOROOT=%{_libdir}/go|g' %{buildroot}%{_bindir}/gomake - -install -Dm644 lib/{lib9.a,libbio.a,libmach.a} %{buildroot}%{_libdir} +mkdir -p $GOROOT/pkg/obj +install -Dm644 pkg/obj/{libgc.a,libcc.a,lib9.a,libbio.a,libmach.a} $GOROOT/pkg/obj cp -r lib/godoc $GOROOT/lib cp -r pkg $GOROOT @@ -206,19 +192,15 @@ %defattr(-,root,root,-) %doc AUTHORS CONTRIBUTORS LICENSE PATENTS README %ifarch %ix86 %arm -%{_bindir}/8* +%{_libdir}/go/bin/tool/8* +%endif +%ifarch x86_64 +%{_libdir}/go/bin/tool/6* %endif -%{_bindir}/6* %ifarch %arm -%{_bindir}/5* +%{_libdir}/go/bin/tool/5* %endif -%{_bindir}/cgo -%{_bindir}/ebnflint %{_bindir}/go* -%{_sbindir}/goinstall -%{_libdir}/lib9.a -%{_libdir}/libbio.a -%{_libdir}/libmach.a %{_libdir}/go/ %{_datadir}/go/ %config %{_sysconfdir}/bash_completion.d/go @@ -235,7 +217,7 @@ %files emacs %defattr(-,root,root,-) -%{_datadir}/emacs/site-lisp/go-mode*.el +%{_datadir}/emacs/site-lisp/go-mode* %files kate %defattr(-,root,root,-) ++++++ VERSION ++++++ --- /var/tmp/diff_new_pack.TQdJep/_old 2012-02-14 11:24:16.000000000 +0100 +++ /var/tmp/diff_new_pack.TQdJep/_new 2012-02-14 11:24:16.000000000 +0100 @@ -1 +1 @@ -weekly.2012-01-15 f690897afe60 +weekly.2012-02-08 5690c7e8 ++++++ go-0.0.r60.3+hg20120120.tar.bz2 -> go-0.0.r60.3+hg20120207.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/go/go-0.0.r60.3+hg20120120.tar.bz2 /work/SRC/openSUSE:Factory/.go.new/go-0.0.r60.3+hg20120207.tar.bz2 differ: char 11, line 1 ++++++ go-godoc-path-locations.patch ++++++ --- /var/tmp/diff_new_pack.TQdJep/_old 2012-02-14 11:24:16.000000000 +0100 +++ /var/tmp/diff_new_pack.TQdJep/_new 2012-02-14 11:24:16.000000000 +0100 @@ -4,7 +4,7 @@ @@ -88,6 +88,12 @@ pkgHandler httpHandler ) - + +// OPENSUSE-PATCHFIX-GODOC-LOCATIONS +const ( + docroot = "/usr/share/doc/packages/go-doc/doc" @@ -17,7 +17,7 @@ @@ -98,9 +104,9 @@ } fsMap.Init(paths) - + - fileServer = http.FileServer(fsHttp) - cmdHandler = httpHandler{"/cmd/", filepath.Join(*goroot, "src", "cmd"), false} - pkgHandler = httpHandler{"/pkg/", filepath.Join(*goroot, "src", "pkg"), true} @@ -25,11 +25,11 @@ + cmdHandler = httpHandler{"/cmd/", filepath.Join(srcroot, "src/cmd"), false} + pkgHandler = httpHandler{"/pkg/", filepath.Join(srcroot, "src/pkg"), true} } - + func registerPublicHandlers(mux *http.ServeMux) { @@ -603,7 +609,7 @@ } - + func readTemplate(name string) *template.Template { - path := filepath.Join(*goroot, "lib", "godoc", name) + path := filepath.Join(*goroot, "lib/"+name) @@ -38,9 +38,9 @@ path = filepath.Join(*templateDir, name) @@ -780,6 +786,16 @@ } - + func serveFile(w http.ResponseWriter, r *http.Request) { -+ // openSUSE: serv docs from root of go-doc package install location ++ // openSUSE: serv docs from root of go-doc package install location + if strings.HasPrefix(r.URL.Path, "/doc/") { + http.Redirect(w, r, "/"+ r.URL.Path[len("/doc"):], http.StatusMovedPermanently) + return @@ -49,17 +49,17 @@ + serveHTMLDoc(w, r, filepath.Join(docroot, "root.html"), "root.html") + return + } -+ ++ relpath := r.URL.Path - + // Check to see if we need to redirect or serve another file. @@ -794,7 +810,7 @@ } - + relpath = relpath[1:] // strip leading slash - abspath := absolutePath(relpath, *goroot) + abspath := absolutePath(relpath, docroot) - + switch path.Ext(relpath) { case ".html": @@ -1368,7 +1384,7 @@ @@ -70,4 +70,4 @@ + scan(filepath.Join(docroot, "")) docMetadata.set(metadata) } - + ++++++ go-install-dont-rebuild-std-packages.patch ++++++ --- /var/tmp/diff_new_pack.TQdJep/_old 2012-02-14 11:24:16.000000000 +0100 +++ /var/tmp/diff_new_pack.TQdJep/_new 2012-02-14 11:24:16.000000000 +0100 @@ -1,31 +1,35 @@ diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go +index bad37df..38c7c47 100644 --- a/src/cmd/go/build.go +++ b/src/cmd/go/build.go -@@ -68,6 +68,7 @@ - var buildP = runtime.NumCPU() // -p flag - var buildV bool // -v flag - var buildX bool // -x flag -+var buildS bool // OPENSUSE -s (for packaging only) +@@ -64,6 +64,7 @@ func init() { + } - var buildO = cmdBuild.Flag.String("o", "", "output file") + // Flags set by multiple commands. ++var buildS bool // OPENSUSE -s (for packaging only) + var buildA bool // -a flag + var buildN bool // -n flag + var buildP = runtime.NumCPU() // -p flag +@@ -75,6 +76,9 @@ var buildContext = build.DefaultContext -@@ -78,6 +79,8 @@ - cmd.Flag.IntVar(&buildP, "p", buildP, "") - cmd.Flag.BoolVar(&buildV, "v", false, "") - cmd.Flag.BoolVar(&buildX, "x", false, "") + // addBuildFlags adds the flags common to the build and install commands. + func addBuildFlags(cmd *Command) { + // OPENSUSE + cmd.Flag.BoolVar(&buildS, "s", false, "") - } - - func runBuild(cmd *Command, args []string) { -@@ -315,6 +318,9 @@ - } ++ + cmd.Flag.BoolVar(&buildA, "a", false, "") + cmd.Flag.BoolVar(&buildN, "n", false, "") + cmd.Flag.IntVar(&buildP, "p", buildP, "") +@@ -645,6 +649,12 @@ func (b *builder) build(a *action) error { - if p.Standard { -+ if buildS { -+ return a -+ } - switch p.ImportPath { - case "builtin", "unsafe": - // Fake packages - nothing to build. -diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go \ No newline at end of file + // install is the action for installing a single package or executable. + func (b *builder) install(a *action) error { ++ ++ // OPENSUSE ++ if buildS && (a.p.Standard || a.p.ImportPath == "cmd/cgo") { ++ return nil ++ } ++ + a1 := a.deps[0] + perm := os.FileMode(0666) + if a1.link { ++++++ macros.go ++++++ --- /var/tmp/diff_new_pack.TQdJep/_old 2012-02-14 11:24:16.000000000 +0100 +++ /var/tmp/diff_new_pack.TQdJep/_new 2012-02-14 11:24:16.000000000 +0100 @@ -36,25 +36,54 @@ # See "go help install/importpath/gopath" %goinstall() \ -mkdir -p %{_builddir}/src/%1 && rmdir %{_builddir}/src/%1 \ -ln -s %{_builddir}/%(basename %1) %{_builddir}/src/%1 \ +export GOPATH=%{_builddir}/go \ +mkdir -p %{_builddir}/go/src/%1 && mkdir %{_builddir}/go/bin -p && mv ./* %{_builddir}/go/src/%1 \ +mkdir -p %{_builddir}/go/pkg/linux_%{go_arch}/%1 \ +cd ../ && rmdir %{_builddir}/%(basename %1) \ +ln -s %{_builddir}/go/src/%1 %{_builddir}/%(basename %1) \ install -d %{buildroot}%{go_sitearch} \ install -d %{buildroot}%{_bindir} \ if [ %# -gt 1 ]; then \ - GOIMPORT=%1/%2 \ + if [ "%2" == "..." ]; then \ + GOIMPORT=%1%2 \ + else \ + GOIMPORT=%1/%2 \ + fi \ else \ GOIMPORT=%1 \ fi \ -GCFLAGS=-l GOPATH=%{go_dir}:%{_builddir} GOBIN=%{buildroot}%{_bindir} go install -s -v -p 4 $GOIMPORT \ -cp -arv %{_builddir}/pkg/linux_%{go_arch}/* %{buildroot}%{go_sitearch} \ +GOPATH=%{_builddir}/go go install -s -v -x -p 4 $GOIMPORT \ +cp -arv %{_builddir}/go/pkg/linux_%{go_arch}/%1 %{buildroot}%{go_sitearch} \ +TMPBIN=%{_builddir}/go/bin \ +if [ "$(ls -A $TMPBIN)" ]; then \ + install -m755 $TMPBIN/* %{buildroot}%{_bindir} \ +fi \ %{nil} %gotest() \ if [ %# -gt 1 ]; then \ - GOIMPORT=%1/%2 \ + if [ "%2" == "..." ]; then \ + GOIMPORT=%1%2 \ + else \ + GOIMPORT=%1/%2 \ + fi \ else \ GOIMPORT=%1 \ fi \ -GOPATH=%{go_dir}:%{_builddir} \ +GOPATH=%{_builddir}/go \ go test $GOIMPORT \ %{nil} + +%gofix() \ +if [ %# -gt 1 ]; then \ + if [ "%2" == "..." ]; then \ + GOIMPORT=%1%2 \ + else \ + GOIMPORT=%1/%2 \ + fi \ +else \ + GOIMPORT=%1 \ +fi \ +GOPATH=%{_builddir}/go \ +go fix $GOIMPORT \ +%{nil} \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
