From 123a584e422fdbc2f5cf5f8619067837489263fb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 4 Feb 2012 21:01:59 +0000 Subject: [PATCH] [packages_10.03.2] rrdtool: merge r29874 SVN-Revision: 30152 --- utils/rrdtool/Makefile | 4 ++-- utils/rrdtool/patches/020-x86-float-cast.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 utils/rrdtool/patches/020-x86-float-cast.patch diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index 381fa0431e..c73b4e1109 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2009 OpenWrt.org +# Copyright (C) 2007-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:=rrdtool PKG_VERSION:=1.2.30 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/utils/rrdtool/patches/020-x86-float-cast.patch b/utils/rrdtool/patches/020-x86-float-cast.patch new file mode 100644 index 0000000000..f3824041e0 --- /dev/null +++ b/utils/rrdtool/patches/020-x86-float-cast.patch @@ -0,0 +1,13 @@ +Index: rrdtool-1.2.30/src/rrd_format.h +=================================================================== +--- rrdtool-1.2.30.orig/src/rrd_format.h ++++ rrdtool-1.2.30/src/rrd_format.h +@@ -22,7 +22,7 @@ + /* #define RRD_VERSION "0002" */ + /* changed because microsecond precision requires another field */ + #define RRD_VERSION "0003" +-#define FLOAT_COOKIE 8.642135E130 ++#define FLOAT_COOKIE ((double)8.642135E130) + + #include "rrd_nan_inf.h" + -- 2.30.2