[csw-devel] SF.net SVN: gar:[14658] csw/mgar/pkg/graphviz/trunk

[ellson at users.sourceforge.net]

Revision: 14658
          http://gar.svn.sourceforge.net/gar/?rev=14658&view=rev
Author:   ellson
Date:     2011-05-29 14:44:20 +0000 (Sun, 29 May 2011)

Log Message:
-----------
graphviz: gvpr_Makefile.am.patch - to work around libtool adding -ltdl to everything, gv_Makefile.am.patch - to work around broken compile switches from perl

Modified Paths:
--------------
    csw/mgar/pkg/graphviz/trunk/Makefile
    csw/mgar/pkg/graphviz/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch
    csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch

Modified: csw/mgar/pkg/graphviz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/graphviz/trunk/Makefile	2011-05-29 08:23:04 UTC (rev 14657)
+++ csw/mgar/pkg/graphviz/trunk/Makefile	2011-05-29 14:44:20 UTC (rev 14658)
@@ -14,10 +14,15 @@
 # disable dependency checks because plugins depend on libs from base package
 ENABLE_CHECK = 0
 
+GARCOMPILER = GCC4
+#NORUNPATH = 1
+
 PATCHFILES += configure.patch
 PATCHFILES += Makefile.am.patch
 PATCHFILES += trapezoid.c.patch
 PATCHFILES += post_process.c.patch
+PATCHFILES += gvpr_Makefile.am.patch
+PATCHFILES += gv_Makefile.am.patch
 
 PACKAGES = CSWgraphviz \
 	CSWgraphvizdevel \
@@ -220,6 +225,7 @@
 CONFIGURE_ARGS += --disable-php
 CONFIGURE_ARGS += --disable-r
 CONFIGURE_ARGS += --enable-static --enable-shared
+CONFIGURE_ARGS += --disable-silent-rules
 CONFIGURE_ARGS += "PANGOCAIRO_CFLAGS=`pkg-config --cflags pangocairo`"
 
 

Modified: csw/mgar/pkg/graphviz/trunk/checksums
===================================================================
--- csw/mgar/pkg/graphviz/trunk/checksums	2011-05-29 08:23:04 UTC (rev 14657)
+++ csw/mgar/pkg/graphviz/trunk/checksums	2011-05-29 14:44:20 UTC (rev 14658)
@@ -7,4 +7,6 @@
 85ebea4df5ba1af93d04f52dbf7b94b6  Makefile.am.patch
 5ced04f48ec6c223d6a6e51c2f6219d0  trapezoid.c.patch
 31f8a6e9e31075ad537fc2b9d2e6ab09  post_process.c.patch
+a9e6a8d6711f217155272c1e17e7d106  gvpr_Makefile.am.patch
+a474494b403fe8217785c50eaee4a5df  gv_Makefile.am.patch
 8d26c1171f30ca3b1dc1b429f7937e58  graphviz-2.28.0.tar.gz

Added: csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch	2011-05-29 14:44:20 UTC (rev 14658)
@@ -0,0 +1,15 @@
+--- graphviz-2.28.0/tclpkg/gv/Makefile.am.orig	2011-03-28 20:15:56.000000000 +0200
++++ graphviz-2.28.0/tclpkg/gv/Makefile.am	2011-05-29 16:38:29.887586723 +0200
+@@ -133,9 +133,9 @@
+ 
+ pkgperldir = $(pkglibdir)/perl
+ PERL        ?= perl
+-PERL_CC      = $(shell $(PERL) -MExtUtils::Embed -e ccopts)
+-PERL_LD      = $(shell $(PERL) -MExtUtils::Embed -e ldopts)
+-VENDOR_ARCH  = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};')
++PERL_CC      = `$(PERL) -MExtUtils::Embed -e ccopts | $(SED) -e 's/-x[^ ]* //g'`
++PERL_LD      = `$(PERL) -MExtUtils::Embed -e ldopts`
++VENDOR_ARCH  = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'`
+ PERL_data = gv.pm
+ nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data)
+ libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c

Added: csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch	2011-05-29 14:44:20 UTC (rev 14658)
@@ -0,0 +1,11 @@
+--- graphviz-2.28.0/lib/gvpr/Makefile.am.orig	2011-05-29 14:42:32.102324093 +0200
++++ graphviz-2.28.0/lib/gvpr/Makefile.am	2011-05-29 14:42:51.192032898 +0200
+@@ -3,6 +3,8 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
++LIBS=
++
+ GVPR_VERSION="2:0:0"
+ 
+ AM_CPPFLAGS = \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.