From f213ebc4e93c66c2e629107c9c60a28304d2b3b8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 9 Dec 2011 18:02:03 +0000 Subject: [PATCH] collectd: currently the build fails due to the combination of -Werror and deprecation warnings in libgcrypt used by mod-network - drop the usage of -Werror for now SVN-Revision: 29489 --- .../collectd/patches/003-remove-werror.patch | 22 +++++++++++++++++++ .../patches/900-add-iwinfo-plugin.patch | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 utils/collectd/patches/003-remove-werror.patch diff --git a/utils/collectd/patches/003-remove-werror.patch b/utils/collectd/patches/003-remove-werror.patch new file mode 100644 index 000000000..89fce67f3 --- /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}"' \ diff --git a/utils/collectd/patches/900-add-iwinfo-plugin.patch b/utils/collectd/patches/900-add-iwinfo-plugin.patch index 09fca509a..f195c1b18 100644 --- a/utils/collectd/patches/900-add-iwinfo-plugin.patch +++ b/utils/collectd/patches/900-add-iwinfo-plugin.patch @@ -231,7 +231,7 @@ + continue; + + if (strstr(ifname, "mon.") || strstr(ifname, ".sta") || -+ strstr(ifname, "wmaster") || strstr(ifname, "wifi")) ++ strstr(ifname, "tmp.") || strstr(ifname, "wifi")) + continue; + + iwinfo_process(ifname); -- 2.30.2