[Pkg-octave-commit] [octave] 02/02: Disable JIT on armel, armhf, mips, mipsel, powerpc.

[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 359174c8c94cdff47ddf4691dba616bc70053153
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Jan 7 22:20:41 2014 +0100

    Disable JIT on armel, armhf, mips, mipsel, powerpc.
---
 debian/control |  4 ++--
 debian/rules   | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index c00417d..7e004eb 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
  libqhull-dev, desktop-file-utils, libfltk1.3-dev, libgl2ps-dev,
  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, default-jdk, libqscintilla2-dev, libxft-dev,
- javahelper
+ dpkg-dev (>= 1.16.1), llvm-dev [!armel !armhf !mips !mipsel !powerpc],
+ default-jdk, 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
diff --git a/debian/rules b/debian/rules
index e8a93e7..8ad46c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,14 @@ export DEB_VERSION_UPSTREAM
 include /usr/share/javahelper/java-vars.mk
 JAVA_LIBDIR := $(firstword $(JVM_CLIENT_DIR) $(JVM_SERVER_DIR))
 
+# Disable the JIT on some archs. This arch list must be kept in sync with the
+# arch list qualifying llvm-dev in debian/control.
+include /usr/share/dpkg/architecture.mk
+NO_JIT_ARCHS := armel armhf mips mipsel powerpc
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_JIT_ARCHS)))
+DISABLE_JIT_FLAG := --disable-jit
+endif
+
 %:
 	dh $@ --with autoreconf --parallel
 
@@ -25,7 +33,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)
+		--with-java-libdir=$(JAVA_LIBDIR) $(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