[Pkg-octave-commit] [octave] 01/01: Disable Java on hurd-i386.

[Mike Miller]

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

mtmiller pushed a commit to branch master
in repository octave.

commit dfaa79d80f81db427aecb37e57e6cb4c2c49a073
Author: Mike Miller <mtmiller at debian.org>
Date:   Fri Jan 10 08:32:48 2014 -0500

    Disable Java on hurd-i386.
---
 debian/control |  4 ++--
 debian/rules   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 7e004eb..a959eee 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, libqscintilla2-dev, libxft-dev, javahelper
+ default-jdk [!hurd-i386], 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
+         liboctave2 (= ${binary:Version}), default-jre-headless [!hurd-i386]
 Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base,
  pstoedit
 Suggests: octave-info,
diff --git a/debian/rules b/debian/rules
index 8ad46c9..503f149 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,17 @@ include /usr/share/dpkg/pkg-info.mk
 DEB_VERSION_UPSTREAM := $(subst ~rc,-rc,$(DEB_VERSION_UPSTREAM))
 export DEB_VERSION_UPSTREAM
 
-# Configure default Java paths using javahelper
+# 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
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_JDK_ARCHS)))
+WITH_JAVA_FLAGS := --disable-java
+else
 include /usr/share/javahelper/java-vars.mk
 JAVA_LIBDIR := $(firstword $(JVM_CLIENT_DIR) $(JVM_SERVER_DIR))
+WITH_JAVA_FLAGS := --with-java-homedir=$(JAVA_HOME) --with-java-libdir=$(JAVA_LIBDIR)
+endif
 
 # Disable the JIT on some archs. This arch list must be kept in sync with the
 # arch list qualifying llvm-dev in debian/control.
@@ -32,8 +40,7 @@ clean:
 
 # override normal dh_auto_configure call to pass OpenMP flag to it (#631831)
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-openmp --with-java-homedir=$(JAVA_HOME) \
-		--with-java-libdir=$(JAVA_LIBDIR) $(DISABLE_JIT_FLAG)
+	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(DISABLE_JIT_FLAG)
 
 # dh_auto_test tries to run "make test", so override it
 override_dh_auto_test:

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