enable go rpms, experimentally

diff --git a/configure.ac b/configure.ac
index 2dd6bb339739e39d1dcaf1e05b05a28cb1b3ee74..fac4e1508ab94bf292554aea9c436eb53e132f17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,13 +102,16 @@ AC_SUBST([GRAPHVIZ_VERSION_BUILD])
 AC_SUBST([GRAPHVIZ_VERSION_REVISION])
 
 AC_ARG_VAR(LIBPOSTFIX, [subscript to lib, e.g. "/64" for "/usr/lib/64" on Solaris])
+AC_ARG_VAR(INTGOSIZE, [integer size for go, 32 or 64])
 
+INTGOSIZE=32
 if test -z "$LIBPOSTFIX"; then
   case "${host_os}" in
     *linux* )
       case "${host_cpu}" in
         aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
           LIBPOSTFIX="64"
+          INTGOSIZE=64
           ;;
       esac
       ;;
@@ -116,6 +119,7 @@ if test -z "$LIBPOSTFIX"; then
       case "${host_cpu}" in
         x86_64 | sparc64 )
           LIBPOSTFIX="/64"
+          INTGOSIZE=64
           ;;
       esac
       ;;
@@ -674,6 +678,7 @@ else
 #          AC_SUBST([GO_INSTALL_DIR])
           AC_SUBST([GO_INCLUDES])
           AC_SUBST([GO_LIBS])
+          AC_SUBST([INTGOSIZE])
         fi
       fi
     fi

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 493001f3f093a9585d5c57373e797fe5b8fcd3c6..9fffcc2668ffbca352dc5629520812694d362d6e 100644 (file)
--- 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 >= 23
+%if %fedora >= 20
 %define _GO 1
 BuildRequires: golang >= 1.2 gcc-go
 %endif

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 9f058eb1a5b3fe3d90107d9c5ad3cc36a2ce4e5e..c54ff28deb31d9ce2afbfe0a76706be468201c13 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -39,29 +39,27 @@ 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_gc.c gv.go: gv_go.cpp
 gv_go.cpp: gv.i
-       $(SWIG) -c++ -go -o gv_go.cpp $(srcdir)/gv.i
+       $(SWIG) -c++ -go -intgosize $(INTGOSIZE) -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 ../../; \
-#      )
+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; \
+        cat $(srcdir)/gv_gc.c >go/src/gv_gc.c; \
+       cd go/src; \
+       GOPATH=/home/ellson/FIX/Linux.x86_64/build/graphviz/tclpkg/gv/go \
+       $(GO) build -x -work -gccgoflags -lgvc -compiler gccgo gvgotest.go && mv gvgotest ../../; \
+       )
 
 pkgguiledir = $(pkglibdir)/guile
 GUILE_data = 
@@ -292,11 +290,11 @@ pkgsharp_LTLIBRARIES = libgv_sharp.la
 DEVTSTS += test_sharp
 endif
 if WITH_GO
-#pkggo_DATA = $(GO_data)
-#man_MANS += gv.3go
-#pdf_DATA += gv.3go.pdf
-#pkggo_LTLIBRARIES = libgv_go.la
-#DEVTSTS += test_go
+pkggo_DATA = $(GO_data)
+man_MANS += gv.3go
+pdf_DATA += gv.3go.pdf
+pkggo_LTLIBRARIES = libgv_go.la
+DEVTSTS += test_go
 endif
 if WITH_GUILE
 pkgguile_DATA = $(GUILE_data)