From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 9 Dec 2011 18:04:29 +0000 (+0000)
Subject: [packages_10.03.1] collectd: merge r29489
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=91c045b426d31a31571bb1066ead823bd5ceb46e;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.1] collectd: merge r29489


SVN-Revision: 29490
---

diff --git a/utils/collectd/patches/003-remove-werror.patch b/utils/collectd/patches/003-remove-werror.patch
new file mode 100644
index 0000000000..89fce67f38
--- /dev/null
+++ b/utils/collectd/patches/003-remove-werror.patch
@@ -0,0 +1,22 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,7 @@ SUBDIRS += liboconfig
+ endif
+ 
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+ 
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"'
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1836,7 +1836,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2)
+-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
+ 	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
+ 	-DLOCALSTATEDIR='"${localstatedir}"' \