From e222c7b48a2d7799527571e57da482eccf98f2d5 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 4 May 2009 15:21:38 +0000 Subject: [PATCH] fix rrdtool compile git-svn-id: svn://svn.openwrt.org/openwrt/packages@15590 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/rrdtool-1.0.x/Makefile | 2 +- libs/rrdtool-1.0.x/patches/002-no_timezone.patch | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 libs/rrdtool-1.0.x/patches/002-no_timezone.patch diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile index cb9c25f53..af19bd5bc 100644 --- a/libs/rrdtool-1.0.x/Makefile +++ b/libs/rrdtool-1.0.x/Makefile @@ -97,7 +97,7 @@ Round Robin Database (RRD) management tools. This package contains command line tools used to manage RRDs. endef -TARGET_CFLAGS += $(FPIC) +TARGET_CFLAGS += $(FPIC) --std=c99 CONFIGURE_ARGS += \ $(DISABLE_LARGEFILE) \ diff --git a/libs/rrdtool-1.0.x/patches/002-no_timezone.patch b/libs/rrdtool-1.0.x/patches/002-no_timezone.patch new file mode 100644 index 000000000..07564b4dd --- /dev/null +++ b/libs/rrdtool-1.0.x/patches/002-no_timezone.patch @@ -0,0 +1,24 @@ +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -225,11 +225,8 @@ + struct rusage myusage; + struct timeval starttime; + struct timeval currenttime; +- struct timezone tz; + +- tz.tz_minuteswest =0; +- tz.tz_dsttime=0; +- gettimeofday(&starttime,&tz); ++ gettimeofday(&starttime,NULL); + #endif + + while (fgets(aLine, sizeof(aLine)-1, stdin)){ +@@ -252,7 +249,7 @@ + + #if HAVE_GETRUSAGE + getrusage(RUSAGE_SELF,&myusage); +- gettimeofday(¤ttime,&tz); ++ gettimeofday(¤ttime,NULL); + printf("OK u:%1.2f s:%1.2f r:%1.2f\n", + (double)myusage.ru_utime.tv_sec+ + (double)myusage.ru_utime.tv_usec/1000000.0, -- 2.11.0