[packages_10.03.2] rrdtool-1.0.x: merge r29874

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30062 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile
index 4e0eebc..22a1fe6 100644 (file)
--- a/libs/rrdtool-1.0.x/Makefile
+++ b/libs/rrdtool-1.0.x/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrdtool1
 PKG_VERSION:=1.0.50
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION)
 PKG_SOURCE:=rrdtool-$(PKG_VERSION).tar.gz

diff --git a/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch b/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch
new file mode 100644 (file)
index 0000000..5b8a662
--- /dev/null
+++ b/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch
@@ -0,0 +1,13 @@
+Index: rrdtool-1.0.50/src/rrd_format.h
+===================================================================
+--- rrdtool-1.0.50.orig/src/rrd_format.h
++++ rrdtool-1.0.50/src/rrd_format.h
+@@ -20,7 +20,7 @@
+ 
+ #define RRD_COOKIE    "RRD"
+ #define RRD_VERSION   "0001"
+-#define FLOAT_COOKIE  8.642135E130
++#define FLOAT_COOKIE  ((double)8.642135E130)
+ 
+ #if defined(WIN32)
+ #define DNAN          ((double)fmod(0.0,0.0))