[Pkg-octave-commit] [octave] 01/01: Disable JIT on all archs to fix LLVM library conflicts.

[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 6b6d0ca9b3f5c374fe07e9b49821a2b65d7bdf4e
Author: Mike Miller <mtmiller at debian.org>
Date:   Sun Apr 6 23:21:45 2014 -0400

    Disable JIT on all archs to fix LLVM library conflicts.
    
    Fixes segfault when plotting with fltk using certain video drivers.
    
    Closes: #743260
---
 debian/control |  2 +-
 debian/rules   | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 0a2b0dc..bdda94d 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 [amd64 i386 kfreebsd-amd64 kfreebsd-i386 s390x sparc],
+ dpkg-dev (>= 1.16.1),
  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 bf0b159..abb300d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,13 +30,10 @@ JAVA_LIBDIR := $(firstword $(JVM_CLIENT_DIR) $(JVM_SERVER_DIR))
 WITH_JAVA_FLAGS := --with-java-homedir=$(JAVA_HOME) --with-java-libdir=$(JAVA_LIBDIR)
 endif
 
-# 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
+# Disable the experimental JIT unconditionally for now. The LLVM library
+# interface is unstable. Linking with LLVM may also cause conflicts with other
+# libraries, for example the mesa graphics stack which also uses LLVM.
+JIT_FLAG := --disable-jit
 
 %:
 	dh $@ --with autoreconf --parallel

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