From 5d887eecbc201e805646871b88ef91552d35d5ef Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Fri, 23 Feb 2018 09:28:37 +0100 Subject: [PATCH] work around liblvm2app depreciation --- debian/changelog | 6 ++++-- .../liblvm2app_depreciation_warning.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 debian/patches/liblvm2app_depreciation_warning.patch diff --git a/debian/changelog b/debian/changelog index 82e25a0..7c9a0ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,10 @@ collectd (5.8.0-1) UNRELEASED; urgency=medium * debian/patches: - Added i2c_detection.patch; needed to build against libi2c-4.0. Thanks to Christian Ehrhardt fo reporting this problem and Andreas Hasenack for - providing a patch. - (Closes: #886920) + providing a patch. (Closes: #886920) + - Added liblvm2app_depreciation_warning.patch; allows the the plugin to + build despite liblvm2app depreciation. Thanks to Christian Ehrhardt for + suggesting this workaround. (Closes: #881641) - Added rd_kafka_last_error.patch; needed to build against librdkafka-0.11.0. Thanks to Pavel Rochnyack for providing a patch. - Removed dpdk-pkg-config.patch; included upstream. diff --git a/debian/patches/liblvm2app_depreciation_warning.patch b/debian/patches/liblvm2app_depreciation_warning.patch new file mode 100644 index 0000000..e8bc582 --- /dev/null +++ b/debian/patches/liblvm2app_depreciation_warning.patch @@ -0,0 +1,17 @@ +Description: mute liblvm2app depreciation warning +Forwarded: https://github.com/collectd/collectd/issues/2647 +Author: Christian Ehrhardt +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881641 + +--- a/Makefile.am ++++ b/Makefile.am +@@ -1042,7 +1042,7 @@ endif + if BUILD_PLUGIN_LVM + pkglib_LTLIBRARIES += lvm.la + lvm_la_SOURCES = src/lvm.c +-lvm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLVM2APP_CPPFLAGS) ++lvm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLVM2APP_CPPFLAGS) -Wno-cpp + lvm_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBLVM2APP_LDFLAGS) + lvm_la_LIBADD = $(BUILD_WITH_LIBLVM2APP_LIBS) + endif + diff --git a/debian/patches/series b/debian/patches/series index 8041789..5e00763 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ myplugin_includes.patch nagios-debian-paths.patch rd_kafka_last_error.patch i2c_detection.patch +liblvm2app_depreciation_warning.patch -- 2.30.2