[libreoffice] 05/06: improve default-jdk build-dep to not force it for i386

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit a2174bdfdf0998695b595c4b0fa1947ba68ce272
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 07:45:52 2017 +0100

    improve default-jdk build-dep to not force it for i386
---
 control | 2 +-
 rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/control b/control
index 0811739..4157c99 100644
--- a/control
+++ b/control
@@ -15,7 +15,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                coinor-libcoinmp-dev (>= 1.8.3-2),
                coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
                debhelper (>= 10),
-               default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc],
+               default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc !i386],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
                default-jdk (>= 2:1.8-55) [sparc64],
                default-libmysqlclient-dev,
diff --git a/rules b/rules
index e949dfb..eb38c81 100755
--- a/rules
+++ b/rules
@@ -1046,7 +1046,7 @@ ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "default"
 	BUILD_DEPS += , java-common (>= 0.49)
 	JAVA_HOME=/usr/lib/jvm/default-java
-	BUILD_DEPS += , default-jdk (>= 1:1.6) $(filter-out !ia64 !i386,$(OOO_NO_JAVA_ARCHS))
+	BUILD_DEPS += , default-jdk (>= 1:1.6) $(shell echo "$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))" | sed -e "s/\]/ !i386]/")
     ifeq (i386,$(findstring i386,$(OOO_JAVA_ARCHS)))
 #	BUILD_DEPS += , default-jdk (>= 1:1.9) [i386]
 	# hack.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git