From: Marc Fournier <marc@bl.uem.li>
Date: Wed, 21 Feb 2018 16:30:29 +0000 (+0100)
Subject: Added i2c_detection.patch
X-Git-Tag: collectd-5.8.0-1~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d8858bd2d43934b63dae6e7acf5eef112f727bf;p=pkg-collectd.git

Added i2c_detection.patch

This is needed to make the barometer plugin build on sid.
---

diff --git a/debian/changelog b/debian/changelog
index 6e5d341..776f930 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ collectd (5.8.0-1) UNRELEASED; urgency=medium
   * Enable the intel_rdt plugin, libpqos is now available.
   * Re-enable the varnish plugin, support for varnish 5.2 now implemented.
   * debian/patches:
+    - Added i2c_detection.patch; needed to build against libi2c-4.0.
+      (Closes: #886920)
     - Added rd_kafka_last_error.patch; needed to build against
       librdkafka-0.11.0.
     - Removed dpdk-pkg-config.patch; included upstream.
diff --git a/debian/patches/i2c_detection.patch b/debian/patches/i2c_detection.patch
new file mode 100644
index 0000000..4ca7f0d
--- /dev/null
+++ b/debian/patches/i2c_detection.patch
@@ -0,0 +1,45 @@
+Description: configure: barometer: fix i2c lib usage for 4.0
+Forwarded: https://github.com/collectd/collectd/issues/2646
+Author: Andreas Hasenack <andreas.hasenack@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1742691
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886920
+Last-Update: 2018-02-21
+
+diff --git Makefile.am Makefile.am
+index ae027a368..ef71be836 100644
+--- Makefile.am
++++ Makefile.am
+@@ -591,7 +591,7 @@ if BUILD_PLUGIN_BAROMETER
+ pkglib_LTLIBRARIES += barometer.la
+ barometer_la_SOURCES = src/barometer.c
+ barometer_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+-barometer_la_LIBADD = -lm
++barometer_la_LIBADD = -lm -li2c
+ endif
+ 
+ if BUILD_PLUGIN_BATTERY
+diff --git configure.ac configure.ac
+index e869a6a09..d9854d024 100644
+--- configure.ac
++++ configure.ac
+@@ -1883,7 +1883,7 @@ if test "x$ac_system" = "xLinux"; then
+     [with_libi2c="no (symbol i2c_smbus_read_i2c_block_data not found - have you installed libi2c-dev ?)"],
+     [[
+       #include <stdlib.h>
+-      #include <linux/i2c-dev.h>
++      #include <i2c/smbus.h>
+     ]]
+   )
+ else
+diff --git src/barometer.c src/barometer.c
+index f698005ca..e3d418d2a 100644
+--- src/barometer.c
++++ src/barometer.c
+@@ -27,6 +27,7 @@
+ 
+ #include <fcntl.h>
+ #include <linux/i2c-dev.h>
++#include <i2c/smbus.h>
+ #include <math.h>
+ #include <stdint.h>
+ #include <sys/ioctl.h>
diff --git a/debian/patches/series b/debian/patches/series
index c795534..8041789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ collection_conf_path.patch
 myplugin_includes.patch
 nagios-debian-paths.patch
 rd_kafka_last_error.patch
+i2c_detection.patch