[Pkg-octave-commit] [octave] 01/02: Deactivate java support on armhf. Fixes FTBFS there.
Sébastien Villemot
sebastien at debian.org
Sat May 10 23:05:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository octave.
commit 891887434a3f40233e40d6434851140d28d0afef
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sat May 10 10:39:15 2014 +0200
Deactivate java support on armhf. Fixes FTBFS there.
---
debian/control | 2 +-
debian/rules | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index bdda94d..ce8d523 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Package: octave
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version}),
liboctave2 (= ${binary:Version}),
- default-jre-headless [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !mipsel !sparc]
+ default-jre-headless [!armhf !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 abb300d..422d3f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,13 @@ export DEB_VERSION_UPSTREAM
# 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.
+# On armhf, unit tests calling openjdk-7 cause a segmentation fault.
# This arch list must be kept in sync with the arch list qualifying
# default-jre in debian/control (note: we always want default-jdk in
# build deps because it is needed for octave-common, see
# debian/patches/always-build-octave-jar.patch).
include /usr/share/dpkg/architecture.mk
-NO_JDK_ARCHS := hurd-i386 kfreebsd-amd64 kfreebsd-i386 mipsel sparc
+NO_JDK_ARCHS := armhf hurd-i386 kfreebsd-amd64 kfreebsd-i386 mipsel sparc
ifneq (,$(filter $(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
More information about the Pkg-octave-commit
mailing list