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

[bensons at users.sourceforge.net]

Revision: 8967
          http://gar.svn.sourceforge.net/gar/?rev=8967&view=rev
Author:   bensons
Date:     2010-03-04 15:01:25 +0000 (Thu, 04 Mar 2010)

Log Message:
-----------
rrdtool: fixed typo *narf* so 64  bit build works now

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-04 14:30:59 UTC (rev 8966)
+++ csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-03-04 15:01:25 UTC (rev 8967)
@@ -55,7 +55,7 @@
 EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
-CONFIGURE_ARS  = $(DIRPATHS)
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(GARNAME)
 CONFIGURE_ARGS += --disable-lua 
 CONFIGURE_ARGS += --enable-python
@@ -66,7 +66,6 @@
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS += --with-libintl-prefix=$(libdir)
-CONFIGURE_ARGS += --exec-prefix=$(prefix)
 
 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod
 
@@ -78,30 +77,31 @@
 PATCHFILES += patch-bindings-ruby-extconf.rb
 
 BUILD64 = 1
-#NOISAEXEC = 1
 
 STRIP_LIBTOOL = 1
 
+include gar/category.mk
 # ugly fix to fix doc path
 #post-install-modulated:
-	#@echo "  ==> Fixing doc path"
-	#@mv $(DESTDIR)$(prefix)/share/doc/rrdtool-$(GARVERSION) $(DESTDIR)$(prefix)/share/doc/rrdtool
+	#echo "  ==> Fixing doc path"
+	#mv $(DESTDIR)$(prefix)/share/doc/rrdtool-$(GARVERSION) $(DESTDIR)$(prefix)/share/doc/rrdtool
 
-include gar/category.mk
-
 pre-build-modulated:
+	echo "  ==> Adding math function round()"
 	cp $(FILEDIR)/s_round.c $(WORKSRC)/src
 	cp $(FILEDIR)/s_round.h $(WORKSRC)/src
 	@$(MAKECOOKIE)
 
 post-patch-isa-amd64:
-	@# since our perl is 32bit, we need to patch away the module build
+	@# since our perl/python is 32bit, we need to patch away the build
+	echo "  ==> Removing perl/python module"
 	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in
 	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in
 	@$(MAKECOOKIE)
 
 post-patch-isa-sparcv9:
-	@# since our perl is 32bit, we need to patch away the module build
+	@# since our perl/python is 32bit, we need to patch away the build
+	echo "  ==> Removing perl/python module"
 	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-Makefile.in
 	gpatch -d$(WORKSRC) -p1 -F2 < $(FILEDIR)/patch-64-bindings-Makefile.in
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	2010-03-04 14:30:59 UTC (rev 8966)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	2010-03-04 15:01:25 UTC (rev 8967)
@@ -30,6 +30,10 @@
 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.