From: John Ellson <ellson@research.att.com>
Date: Tue, 15 Jul 2014 16:44:31 +0000 (-0400)
Subject: go not ready for fc22
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f501ee7e1748ae843a72cd88d6931b2305069e0;p=graphviz

go not ready for fc22
---

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 4a48a526b..0baee475e 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -164,7 +164,7 @@ BuildRequires: libwebp-devel
 %if %fedora >= 19
 %define SEPARATE_LICENSE 1
 %endif
-%if %fedora >= 22
+%if %fedora >= 23
 %define _GO 1
 BuildRequires: golang >= 1.2 gcc-go
 %endif
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 50a6f023e..089b028e6 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -34,25 +34,34 @@ gv_sharp.cpp: gv.i
 
 pkggodir = $(pkglibdir)/go
 GO_data = 
-#nodist_libgv_go_la_SOURCES = gv_go.cpp
-#libgv_go_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
-#libgv_go_la_LIBADD = $(BASELIBS) $(GO_LIBS)
-#libgv_go_la_LDFLAGS = -module -avoid-version
-#libgv_go_la_CPPFLAGS = $(BASECPPFLAGS) $(GO_INCLUDES)
-gvgotest: gv.i gvgotest.go
-	( \
-	mkdir -p go/src/gv; \
-	$(SED) -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' <$(srcdir)/gv.i >go/src/gv/gv.swigcxx; \
-	$(SED) -e 's/#include <gvc.h>/#include <graphviz\/gvc.h>/' <$(srcdir)/gv_dummy_init.c >go/src/gv/gv_dummy_init.c; \
-	$(SED) -e 's/#include "gvplugin.h"/#include <graphviz\/gvplugin.h>/' <$(srcdir)/gv_builtins.c >go/src/gv/gv_builtins.c; \
-	$(SED) -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' -e 's/DEMAND_LOADING/1/' <$(srcdir)/gv.cpp >go/src/gv/gv.cpp; \
-	echo "package gv" >go/src/gv/gv.go; \
-	cat $(srcdir)/gvgotest.go >go/src/gvgotest.go; \
-	cd go/src; \
-	GOROOT=/home/ellson/FIX/Linux.x86_64/build/go \
-	GOPATH=/home/ellson/FIX/Linux.x86_64/build/graphviz/tclpkg/gv/go \
-	/home/ellson/FIX/Linux.x86_64/build/go/bin/go build -x -work -gccgoflags -lgvc -compiler gccgo gvgotest.go && mv gvgotest ../../; \
-	)
+nodist_libgv_go_la_SOURCES = gv_go.cpp
+libgv_go_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
+libgv_go_la_LIBADD = $(BASELIBS) $(GO_LIBS)
+libgv_go_la_LDFLAGS = -module -avoid-version
+libgv_go_la_CPPFLAGS = $(BASECPPFLAGS) $(GO_INCLUDES)
+gv_go.cpp: gv.i
+	$(SWIG) -c++ -go -o gv_go.cpp $(srcdir)/gv.i
+	mv $@ $@.orig
+	sed '/include/s/malloc\.h/cstdlib/' $@.orig > $@
+	rm $@.orig
+
+
+
+
+#gvgotest: gv.i gvgotest.go
+#	( \
+#	mkdir -p go/src/gv; \
+#	$(SED) -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' <$(srcdir)/gv.i >go/src/gv/gv.swigcxx; \
+#	$(SED) -e 's/#include <gvc.h>/#include <graphviz\/gvc.h>/' <$(srcdir)/gv_dummy_init.c >go/src/gv/gv_dummy_init.c; \
+#	$(SED) -e 's/#include "gvplugin.h"/#include <graphviz\/gvplugin.h>/' <$(srcdir)/gv_builtins.c >go/src/gv/gv_builtins.c; \
+#	$(SED) -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' -e 's/DEMAND_LOADING/1/' <$(srcdir)/gv.cpp >go/src/gv/gv.cpp; \
+#	echo "package gv" >go/src/gv/gv.go; \
+#	cat $(srcdir)/gvgotest.go >go/src/gvgotest.go; \
+#	cd go/src; \
+#	GOROOT=/home/ellson/FIX/Linux.x86_64/build/go \
+#	GOPATH=/home/ellson/FIX/Linux.x86_64/build/graphviz/tclpkg/gv/go \
+#	/home/ellson/FIX/Linux.x86_64/build/go/bin/go build -x -work -gccgoflags -lgvc -compiler gccgo gvgotest.go && mv gvgotest ../../; \
+#	)
 
 pkgguiledir = $(pkglibdir)/guile
 GUILE_data =