Changes of Revision 27
| [-] | Changed | collectd.spec |
|
x 1 2 Patch7: collectd-fix-config.patch3 Patch9: collectd-version.patch4 Patch10: collectd-perl-vendor.patch5 -#Patch11: collectd-Werror.patch6 +Patch11: collectd-Werror.patch7 URL: http://verplant.org/collectd/8 Group: System/Monitoring9 License: GNU General Public License (GPL)10 11 %patch712 %patch913 %patch1014 -#%patch1115 +%patch1116 %__sed -i 's|@@VERSION@@|%{version}|g' configure.in17 18 %build19 |
||
| [+] | Changed | collectd-Werror.patch ^ |
| @@ -1,5 +1,16 @@ ---- src/Makefile.am.orig 2008-06-29 13:48:59.000000000 +0200 -+++ src/Makefile.am 2008-06-29 13:49:08.000000000 +0200 +--- configure.in.orig 2009-02-23 23:03:36.000000000 +0100 ++++ configure.in 2009-02-23 23:03:48.000000000 +0100 +@@ -1887,7 +1887,7 @@ + SAVE_LDFLAGS=$LDFLAGS + # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) + # (see issues #41 and #42) +- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall" + LDFLAGS="$LDFLAGS $PERL_LDFLAGS" + + AC_CACHE_CHECK([for broken Perl_load_module()], +--- src/Makefile.am.orig 2009-02-23 23:04:37.000000000 +0100 ++++ src/Makefile.am 2009-02-23 23:04:57.000000000 +0100 @@ -10,7 +10,7 @@ endif @@ -9,3 +20,80 @@ endif AM_CPPFLAGS = -DPREFIX='"${prefix}"' +--- src/Makefile.in.orig 2009-02-23 23:04:42.000000000 +0100 ++++ src/Makefile.in 2009-02-23 23:05:07.000000000 +0100 +@@ -1339,7 +1339,7 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) \ + $(am__append_3) +-@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}"' \ +--- src/liboping/Makefile.in.orig 2009-02-23 23:06:35.000000000 +0100 ++++ src/liboping/Makefile.in 2009-02-23 23:06:45.000000000 +0100 +@@ -235,7 +235,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + EXTRA_DIST = AUTHORS COPYING ChangeLog README + noinst_LTLIBRARIES = liboping.la + +--- src/liboping/Makefile.am.orig 2009-02-23 23:06:39.000000000 +0100 ++++ src/liboping/Makefile.am 2009-02-23 23:06:53.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = foreign no-dependencies + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + EXTRA_DIST = AUTHORS COPYING ChangeLog README +--- src/libcollectdclient/Makefile.in.orig 2009-02-23 23:06:04.000000000 +0100 ++++ src/libcollectdclient/Makefile.in 2009-02-23 23:06:14.000000000 +0100 +@@ -250,7 +250,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + pkginclude_HEADERS = client.h lcc_features.h + lib_LTLIBRARIES = libcollectdclient.la + nodist_pkgconfig_DATA = libcollectdclient.pc +--- src/libcollectdclient/Makefile.am.orig 2009-02-23 23:06:07.000000000 +0100 ++++ src/libcollectdclient/Makefile.am 2009-02-23 23:06:21.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = foreign no-dependencies + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + pkginclude_HEADERS = client.h lcc_features.h +--- src/libiptc/Makefile.in.orig 2009-02-23 23:07:15.000000000 +0100 ++++ src/libiptc/Makefile.in 2009-02-23 23:07:21.000000000 +0100 +@@ -234,7 +234,7 @@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies + EXTRA_DIST = libiptc.c README.collectd +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + noinst_LTLIBRARIES = libiptc.la + libiptc_la_CFLAGS = -I$(KERNEL_DIR)/include + libiptc_la_SOURCES = libip4tc.c libip6tc.c \ +--- src/libiptc/Makefile.am.orig 2009-02-23 23:07:07.000000000 +0100 ++++ src/libiptc/Makefile.am 2009-02-23 23:07:28.000000000 +0100 +@@ -3,7 +3,7 @@ + EXTRA_DIST = libiptc.c README.collectd + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + noinst_LTLIBRARIES = libiptc.la | ||
| [+] | Added | collectd-Werror.patch.bak ^ |
| @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig 2008-06-29 13:48:59.000000000 +0200 ++++ src/Makefile.am 2008-06-29 13:49:08.000000000 +0200 +@@ -10,7 +10,7 @@ + endif + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + AM_CPPFLAGS = -DPREFIX='"${prefix}"' | ||