summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84b3ba1)
raw | patch | inline | side by side (parent: 84b3ba1)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 25 Aug 2015 15:27:49 +0000 (17:27 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 25 Aug 2015 15:27:49 +0000 (17:27 +0200) |
debian/changelog | patch | blob | history | |
debian/control | patch | blob | history | |
debian/rules | patch | blob | history |
diff --git a/debian/changelog b/debian/changelog
index 794ae101eb421e4b4501972aee0f453fcddb4160..53fdbfb275337fdba6711dc66f5fb8665d368dc2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
collectd (5.5.0-3) UNRELEASED; urgency=medium
- * debian/rules:
+ * debian/rules, debian/control:
- Avoid hiding compiler options, allowing the buildd log scanner to do
it's job.
+ - Disable smart plugin on non-linux platforms, due to missing
+ libatasmart-dev build-dependency.
-- Marc Fournier <marc.fournier@camptocamp.com> Tue, 25 Aug 2015 06:55:52 +0200
diff --git a/debian/control b/debian/control
index 1f124e6e9aa395ddaea3fe52bdcab3acdb248285..875f9c1b15487aedb9ace8225281665117f1b474 100644 (file)
--- a/debian/control
+++ b/debian/control
iptables-dev (>= 1.4.3.2-2) [linux-any],
javahelper,
kfreebsd-kernel-headers [kfreebsd-any],
- libatasmart-dev,
+ libatasmart-dev [linux-any],
libcap-dev [linux-any],
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
diff --git a/debian/rules b/debian/rules
index 6b0f1ef2e145c1fadec2ec382b0179c635c2558b..0470778f0380bc8e1b0091b3104fc502adaae6bb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
--disable-turbostat
endif
+# libatasmart isn't available on these platforms.
+ifneq (,$(filter hurd-i386 kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+ confflags += --disable-smart
+endif
+
# The hppa buildds currently do not keep up with Java related stuff, thus
# prevending testing transitions. sparc is also having trouble building the
# java plugin.