[Pkg-octave-commit] [octave] 01/01: Disable java on kfreebsd-* and sparc. Fixes FTBFS on those archs.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository octave.

commit c2b4c75727ca6d1f94e6232bc3ed544cfe030f4a
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Feb 20 23:08:21 2014 +0100

    Disable java on kfreebsd-* and sparc. Fixes FTBFS on those archs.
---
 debian/control | 6 ++++--
 debian/rules   | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 0c9e344..bec31e7 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
  libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
  libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec,
  dpkg-dev (>= 1.16.1), llvm-dev [!armel !armhf !mips !mipsel !powerpc],
- default-jdk [!hurd-i386 !mipsel], libqscintilla2-dev, libxft-dev, javahelper
+ default-jdk [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !mipsel !sparc],
+ libqscintilla2-dev, libxft-dev, javahelper
 Standards-Version: 3.9.5
 Homepage: http://www.octave.org/
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave.git
@@ -24,7 +25,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-octave/octave.git
 Package: octave
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version}),
-         liboctave2 (= ${binary:Version}), default-jre-headless [!hurd-i386 !mipsel]
+         liboctave2 (= ${binary:Version}),
+         default-jre-headless [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !mipsel !sparc]
 Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base,
  pstoedit
 Suggests: octave-info,
diff --git a/debian/rules b/debian/rules
index 2b48dc2..6ae0e71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,11 +13,12 @@ DEB_VERSION_UPSTREAM := $(subst ~rc,-rc,$(DEB_VERSION_UPSTREAM))
 export DEB_VERSION_UPSTREAM
 
 # Configure default Java paths using javahelper except on some archs.
-# On hurd-i386 octave FTBFS against gcj-4.8, which is default-jdk.
+# hurd-i386, kfreebsd-* and sparc have gcj as default, which cause either
+# a compilation failure (hurd-i386) or a test failure (other archs).
 # On mipsel java unit tests calling openjdk-7 cause a bus error at runtime.
 # This arch list must be kept in sync with the arch list qualifying
 # default-{jdk,jre} in debian/control.
-NO_JDK_ARCHS := hurd-i386 mipsel
+NO_JDK_ARCHS := hurd-i386 kfreebsd-amd64 kfreebsd-i386 mipsel sparc
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_JDK_ARCHS)))
 WITH_JAVA_FLAGS := --disable-java
 else

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git