more go bits

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 1d749adf6f09837978305bc650e1dace3f2e47b0..b1e8582f2f0233df3e3e9aee3d4088836dfb841c 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -163,7 +163,7 @@ BuildRequires: libwebp-devel
 %endif
 %if %fedora >= 19
 %define _GO 0
-BuildRequires: golang
+BuildRequires: golang >= 1.2 gcc-go
 %endif
 %endif
 

diff --git a/tclpkg/gv/go/README b/tclpkg/gv/go/README
index 6a0a62058e9f414e58c243e04b74e1a264045090..4c563fbb9a7179b97167d274ece949cd10800a74 100644 (file)
--- a/tclpkg/gv/go/README
+++ b/tclpkg/gv/go/README
@@ -1,5 +1,6 @@
-This directory is hopefully temporary,  containing various experimantal code towards a GO language extension.
+This directory is hopefully temporary,  containing various experimental
+code towards a GO language extension.
 
-Currently requires a very recent GO installed in /usr/local/go
-
-(Later than the 1.1.2 available in fc20 or rawhide at this time.)
+Currently requires a very recent GO.  i.e. Later than the 1.1.2
+available in fc20 or rawhide at this time.  Use appropriate setup_xxx, e.g.
+       . ./setup_usr_local

diff --git a/tclpkg/gv/go/setup_ellson b/tclpkg/gv/go/setup_ellson
new file mode 100755 (executable)
index 0000000..ab63006
--- /dev/null
+++ b/tclpkg/gv/go/setup_ellson
@@ -0,0 +1,2 @@
+export GOROOT=/home/ellson/FIX/Linux.x86_64/build/go
+export GOPATH=`pwd`

diff --git a/tclpkg/gv/go/setup_usr b/tclpkg/gv/go/setup_usr
new file mode 100755 (executable)
index 0000000..48bc481
--- /dev/null
+++ b/tclpkg/gv/go/setup_usr
@@ -0,0 +1,2 @@
+export GOROOT=/usr/lib64/golang/
+export GOPATH=`pwd`

diff --git a/tclpkg/gv/go/setup b/tclpkg/gv/go/setup_usr_local_go
similarity index 100%
rename from tclpkg/gv/go/setup
rename to tclpkg/gv/go/setup_usr_local_go

diff --git a/tclpkg/gv/go/src/makefile b/tclpkg/gv/go/src/makefile
index 444d5745c0c2eb2e1c3915aa386bd5d71a43ddd2..483dd67db6dbf50654f916b1e43026d786d145d2 100644 (file)
--- a/tclpkg/gv/go/src/makefile
+++ b/tclpkg/gv/go/src/makefile
@@ -1,7 +1,7 @@
 GO=$(GOROOT)/bin/go
 
 test: test.go prep
-       $(GO) build -work -gccgoflags '-lgvc' -compiler gccgo test.go
+       $(GO) build -x -work -gccgoflags '-lgvc' -compiler gccgo test.go
 
 .PHONY: prep
 prep:

diff --git a/tclpkg/gv/go/src/test.go b/tclpkg/gv/go/src/test.go
index d162d378871347b8f62e1ff7deec32e2636bc0a8..26859031e64668924f9c5d0b4f6a21cb95ffd3f0 100644 (file)
--- a/tclpkg/gv/go/src/test.go
+++ b/tclpkg/gv/go/src/test.go
@@ -1,12 +1,5 @@
 package main
 import ( "gv" )
 func main() {
-    var g    gv.Agraph_t
-    var n, m gv.Agnode_t
-//  var e    gv.Agedge_t
-    g = gv.Digraph("G")
-    n = gv.Node(g, "hello")
-    m = gv.Node(g, "world")
-        gv.Edge(n, m)
-    gv.Write(g, "hello.out")
+    gv.Digraph("G")
 }