[Pkg-octave-commit] [octave] 08/09: Adapt to the fact that JIT is now disabled by default in ./configure script.

[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 1fcf76258227e0a399bcfc3cb09d484d1ecbbbbc
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Mar 9 22:08:09 2014 +0100

    Adapt to the fact that JIT is now disabled by default in ./configure script.
---
 debian/control |  2 +-
 debian/rules   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index a8954df..40ee606 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ 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 [!armel !armhf !hurd-i386 !mips !mipsel !powerpc],
+ dpkg-dev (>= 1.16.1), llvm-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 s390x sparc],
  default-jdk, libqscintilla2-dev, libxft-dev, javahelper
 Standards-Version: 3.9.5
 Homepage: http://www.octave.org/
diff --git a/debian/rules b/debian/rules
index 25b6217..bf0b159 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,12 +30,12 @@ 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. JIT unit tests with LLVM currently segfault on
-# those (except for hurd-i386 where LLVM is not available). This arch list must
-# be kept in sync with the arch list qualifying llvm-dev in debian/control.
-NO_JIT_ARCHS := armel armhf hurd-i386 mips mipsel powerpc
-ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JIT_ARCHS)))
-DISABLE_JIT_FLAG := --disable-jit
+# Enable the JIT on some archs. On other archs, either LLVM is unavailable, or
+# JIT unit tests currently segfault. This arch list must be kept in sync with
+# the arch list qualifying llvm-dev in debian/control.
+JIT_ARCHS := amd64 i386 kfreebsd-amd64 kfreebsd-i386 s390x sparc
+ifneq (,$(filter $(DEB_HOST_ARCH),$(JIT_ARCHS)))
+JIT_FLAG := --enable-jit
 endif
 
 %:
@@ -46,7 +46,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_FLAGS) $(DISABLE_JIT_FLAG)
+	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(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