[Pkg-octave-commit] [octave] 01/02: Re-enable java on amd64, i386 and mips (was disabled by mistake).

[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 9d51f8640884b8e2db304aec0126a63b2d570c5e
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Feb 24 18:21:36 2014 +0100

    Re-enable java on amd64, i386 and mips (was disabled by mistake).
    
    The findstring function does a substring match, so amd64 matches kfreebsd-amd64
    for example. The filter function does what we want.
---
 debian/rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6ae0e71..04be6c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,9 @@ export DEB_VERSION_UPSTREAM
 # On mipsel java unit tests calling openjdk-7 cause a bus error at runtime.
 # This arch list must be kept in sync with the arch list qualifying
 # default-{jdk,jre} in debian/control.
+include /usr/share/dpkg/architecture.mk
 NO_JDK_ARCHS := hurd-i386 kfreebsd-amd64 kfreebsd-i386 mipsel sparc
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_JDK_ARCHS)))
+ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JDK_ARCHS)))
 WITH_JAVA_FLAGS := --disable-java
 else
 include /usr/share/javahelper/java-vars.mk
@@ -30,9 +31,8 @@ endif
 # Disable the JIT on some archs. JIT unit tests with LLVM currently segfault
 # on those. 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)))
+ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JIT_ARCHS)))
 DISABLE_JIT_FLAG := --disable-jit
 endif
 

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