[Pkg-octave-commit] [octave] 01/01: Disable Java on mipsel, using openjdk causes bus error.
Mike Miller
mtmiller at moszumanska.debian.org
Sat Jan 11 14:45:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
mtmiller pushed a commit to branch master
in repository octave.
commit c0e8c73511bd50f5b7d6456c2bd9a2e2685a315a
Author: Mike Miller <mtmiller at debian.org>
Date: Sat Jan 11 09:45:05 2014 -0500
Disable Java on mipsel, using openjdk causes bus error.
---
debian/control | 4 ++--
debian/rules | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index a959eee..1103483 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ 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], libqscintilla2-dev, libxft-dev, javahelper
+ default-jdk [!hurd-i386 !mipsel], 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 +24,7 @@ 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]
+ liboctave2 (= ${binary:Version}), default-jre-headless [!hurd-i386 !mipsel]
Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base,
pstoedit
Suggests: octave-info,
diff --git a/debian/rules b/debian/rules
index 503f149..5c9ff9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export DEB_VERSION_UPSTREAM
# Configure default Java paths using javahelper except on some archs.
# This arch list must be kept in sync with the arch list qualifying
# default-{jdk,jre} in debian/control.
-NO_JDK_ARCHS := hurd-i386
+NO_JDK_ARCHS := hurd-i386 mipsel
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
More information about the Pkg-octave-commit
mailing list