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

[bensons at users.sourceforge.net]

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

Log Message:
-----------
rrdtool: handle sparcv9

Modified Paths:
--------------
    csw/mgar/pkg/rrdtool/branches/benny/Makefile
    csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c

Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-03-02 12:44:13 UTC (rev 8939)
+++ csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-03-02 13:22:34 UTC (rev 8940)
@@ -34,6 +34,8 @@
 RUNTIME_DEP_PKGS += CSWperl
 RUNTIME_DEP_PKGS += CSWruby
 
+# BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) CSWlua
+
 EXTRA_INC = $(prefix)/include/cairo
 EXTRA_INC += $(prefix)/include/libxml2
 EXTRA_INC += $(prefix)/X11/include
@@ -47,9 +49,9 @@
 
 CONFIGURE_ARS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME)
-CONFIGURE_ARGS += --disable-python
+CONFIGURE_ARGS += --disable-lua 
+CONFIGURE_ARGS += --enable-python
 CONFIGURE_ARGS += --enable-ruby
-CONFIGURE_ARGS += --disable-libintl
 CONFIGURE_ARGS += --enable-perl
 CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
@@ -80,10 +82,15 @@
 
 pre-build-isa-amd64:
 	@# since our perl is 32bit, we need to patch away the module build
-	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-amd64-Makefile.in
-	gpatch -d$(WORKSRC) -p1 -F2 < \
-		$(FILEDIR)/patch-amd64-bindings-Makefile.in
+	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in
+	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in
 	@$(MAKECOOKIE)
 
+pre-build-isa-sparcv9:
+	@# since our perl is 32bit, we need to patch away the module build
+	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in
+	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in
+	@$(MAKECOOKIE)
+
 env:
 	@echo "PKG_CONFIG_PATH: $(PKG_CONFIG_PATH)"

Modified: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	2010-03-02 12:44:13 UTC (rev 8939)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	2010-03-02 13:22:34 UTC (rev 8940)
@@ -30,10 +30,6 @@
 round(double x)
 {
         double t;
-/*
-        if (!isfinite(x))
-                return (x);
-*/
         if (x >= 0.0) {
                 t = floor(x);
                 if (t - x <= -0.5)


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