From 1bb843303b49c3530be83667f70e78b80bdd2352 Mon Sep 17 00:00:00 2001 From: Szymon Siwek Date: Thu, 8 Apr 2010 14:04:32 +0000 Subject: [PATCH] - added compile.patch Changed files: collectd.spec -> 1.88 compile.patch -> 1.1 --- collectd.spec | 2 ++ compile.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 compile.patch diff --git a/collectd.spec b/collectd.spec index fd8b67e..19f4319 100644 --- a/collectd.spec +++ b/collectd.spec @@ -80,6 +80,7 @@ Source4: %{name}-lighttpd.conf Source10: %{name}-df.conf Source11: %{name}-rrdtool.conf Patch0: %{name}-collection.patch +Patch1: compile.patch URL: http://collectd.org/ %{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3} BuildRequires: autoconf @@ -1101,6 +1102,7 @@ Perl files from Collectd package %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} diff --git a/compile.patch b/compile.patch new file mode 100644 index 0000000..a808648 --- /dev/null +++ b/compile.patch @@ -0,0 +1,12 @@ +compiling dbi.c with '-Werror' fails (dbi_initialize, dbi_driver_open, +dbi_driver_list are deprecated in recent libdbi) +--- collectd-4.9.1/src/Makefile.am.orig 2010-04-08 15:49:05.024241083 +0200 ++++ collectd-4.9.1/src/Makefile.am 2010-04-08 15:52:22.184768228 +0200 +@@ -265,6 +261,7 @@ if BUILD_PLUGIN_DBI + pkglib_LTLIBRARIES += dbi.la + dbi_la_SOURCES = dbi.c \ + utils_db_query.c utils_db_query.h ++dbi_la_CFLAGS = -Wall + dbi_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBDBI_CPPFLAGS) + dbi_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBDBI_LDFLAGS) + dbi_la_LIBADD = $(BUILD_WITH_LIBDBI_LIBS) -- 2.43.0