Disable the 'java' plugin on sparc for now. It fails to build.

diff --git a/debian/changelog b/debian/changelog
index f3b925cd409f92189072c2612dce7dddecabc267..045bba294431b0c87635507e20a7efe736e9d9cf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ collectd (5.4.1-4) UNRELEASED; urgency=medium
     - Disable preprocessor warnings on kfreebsd to work around an error
       resulting from a redefined macro in PostgreSQL's pg_config_manual.h;
       thanks to Ivo De Decker for reporting this (Closes: #760719).
+  * debian/control, debian/rules:
+    - Disable the 'java' plugin on sparc for now. It fails to build.
 
  -- Sebastian Harl <tokkee@debian.org>  Sat, 27 Sep 2014 19:51:49 +0000
 

diff --git a/debian/control b/debian/control
index 00dba9250696b5217df22750f94442c223002a88..5aec6a6d0658d0983a2b8fbc73b1a165013184a1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libxml2-dev,
  libyajl-dev,
  linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any],
- default-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
+ default-jdk [!hppa !sparc !kfreebsd-i386 !kfreebsd-amd64],
  protobuf-c-compiler,
  python-dev
 Build-Conflicts: libpthread-dev, libhal-dev

diff --git a/debian/rules b/debian/rules
index 168bb186b6fd9a14c35ce78417a8fa19e2108e99..b414178b080f1fe2a99e15433cc1a2f2546db779 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -160,8 +160,9 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 endif
 
 # The hppa buildds currently do not keep up with Java related stuff, thus
-# prevending testing transitions.
-ifneq (,$(filter hppa, $(DEB_BUILD_ARCH)))
+# prevending testing transitions. sparc is also having trouble building the
+# java plugin.
+ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH)))
        confflags += --disable-java
 endif