[csw-devel] SF.net SVN: gar:[8945] csw/mgar/pkg/rrdtool/branches/benny

[bensons at users.sourceforge.net]

Revision: 8945
          http://gar.svn.sourceforge.net/gar/?rev=8945&view=rev
Author:   bensons
Date:     2010-03-02 16:39:13 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
rrdtool: hacked ruby support

Modified Paths:
--------------
    csw/mgar/pkg/rrdtool/branches/benny/Makefile
    csw/mgar/pkg/rrdtool/branches/benny/checksums

Added Paths:
-----------
    csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb

Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-03-02 14:51:54 UTC (rev 8944)
+++ csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-03-02 16:39:13 UTC (rev 8945)
@@ -4,9 +4,9 @@
 
 DESCRIPTION = time-series data logging and graphing.
 define BLURB
-	RRDtool is basically the time-series graphing and data storage/management
-	component of MRTG, broken out and `done right'. `done right' means that
-	RRDtool is magnitudes faster than MRTG and extremely configurable.
+  RRDtool is basically the time-series graphing and data storage/management
+  component of MRTG, broken out and `done right'. `done right' means that
+  RRDtool is magnitudes faster than MRTG and extremely configurable.
 endef
 
 MASTER_SITES = http://oss.oetiker.ch/$(GARNAME)/pub/
@@ -33,6 +33,7 @@
 RUNTIME_DEP_PKGS += CSWzlib
 RUNTIME_DEP_PKGS += CSWperl
 RUNTIME_DEP_PKGS += CSWruby
+RUNTIME_DEP_PKGS += CSWpython
 
 # BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWlua
 
@@ -52,10 +53,12 @@
 CONFIGURE_ARGS += --disable-lua 
 CONFIGURE_ARGS += --enable-python
 CONFIGURE_ARGS += --enable-ruby
+CONFIGURE_ARGS += --with-ruby-options=CFLAGS=
 CONFIGURE_ARGS += --enable-perl
 CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS += --exec-prefix=$(prefix)
 
 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod
 
@@ -64,6 +67,7 @@
 PATCHFILES += patch-src-Makefile.in
 PATCHFILES += patch-src-rrd_open.c
 PATCHFILES += patch-bindings-Makefile.in
+PATCHFILES += patch-bindings-ruby-extconf.rb
 
 # BUILD64 = 1
 

Modified: csw/mgar/pkg/rrdtool/branches/benny/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/checksums	2010-03-02 14:51:54 UTC (rev 8944)
+++ csw/mgar/pkg/rrdtool/branches/benny/checksums	2010-03-02 16:39:13 UTC (rev 8945)
@@ -1,4 +1,5 @@
 c6bc2f9c3d88e0488f0332a9d288dc39  patch-bindings-Makefile.in
+072482090287b462c8c092b2ead132da  patch-bindings-ruby-extconf.rb
 20e58c7facf2687037288c157c32df1a  patch-src-Makefile.in
 47709778545eec2e8c5c3b38f9c94fcd  patch-src-rrd_open.c
 9318d3b4016dd9dd9897f1eac7548032  rrdtool-1.4.2.tar.gz

Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-ruby-extconf.rb	2010-03-02 16:39:13 UTC (rev 8945)
@@ -0,0 +1,11 @@
+--- rrdtool-1.4.2.orig/bindings/ruby/extconf.rb	2010-03-02 16:12:18.622716000 +0100
++++ rrdtool-1.4.2/bindings/ruby/extconf.rb	2010-03-02 17:27:47.399923107 +0100
+@@ -6,7 +6,7 @@
+ if /linux/ =~ RUBY_PLATFORM
+    $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib'
+ elsif /solaris/ =~ RUBY_PLATFORM
+-   $LDFLAGS += '-R$(EPREFIX)/lib'
++   $LDFLAGS += ' -R$(EPREFIX)/lib'
+ elsif /hpux/ =~ RUBY_PLATFORM
+    $LDFLAGS += '+b$(EPREFIX)/lib'
+ elsif /aix/ =~ RUBY_PLATFORM


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