[libreoffice] 01/06: explicitly use openjdk 9 on i386 and make test faillures fatal again

[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 dd889c57849ff6dcd231cc89b364a81cf7422951
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 00:33:27 2017 +0100

    explicitly use openjdk 9 on i386 and make test faillures fatal again
---
 changelog                           |  3 +++
 control                             |  1 +
 patches/fix-JVM_ONE_PATH_CHECK.diff | 15 +++++++++++++++
 patches/series                      |  1 +
 rules                               | 25 ++++++++++++++++++++-----
 5 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index e8aa3f4..c344799 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,9 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
       those work.
     - stop passing --disable-database-connectivity for no-Base archs
       (closes: #874274)
+    - explicitly use openjdk 9 on i386 now that #876069 is fixed. Allow
+      it as the only one by explicitly using --with-jvm-path 
+    - make testsuite failures on i386 fatal again
   * debian/rules, debian/shlibs.override.mysql-connector-c++:
     temporarily force a lower dependency on libmysqlcppconn7v5, works
     also with 1.1.7 and we don't get blocked by mariadb-10.1...
diff --git a/control b/control
index 5991786..0811739 100644
--- a/control
+++ b/control
@@ -149,6 +149,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                lp-solve (>= 5.5.0.13-5+b1),
                maven-repo-helper,
                opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
+               openjdk-9-jdk (>= 9.0.1+11-1) [i386],
                pkg-config,
                pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                python3,
diff --git a/patches/fix-JVM_ONE_PATH_CHECK.diff b/patches/fix-JVM_ONE_PATH_CHECK.diff
new file mode 100644
index 0000000..c38c591
--- /dev/null
+++ b/patches/fix-JVM_ONE_PATH_CHECK.diff
@@ -0,0 +1,15 @@
+--- a/configure.ac-old	2017-11-07 00:09:49.203188321 +0100
++++ b/configure.ac	2017-11-07 00:10:26.419647712 +0100
+@@ -11606,12 +11606,6 @@
+     AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
+     if test -n "$with_jvm_path" -a "$with_jvm_path" != "no"; then
+         AC_MSG_RESULT([yes])
+-        if ! test -d "$with_jvm_path"; then
+-            AC_MSG_ERROR(["$with_jvm_path" not a directory])
+-        fi
+-        if ! test -d "$with_jvm_path"jvm; then
+-            AC_MSG_ERROR(["$with_jvm_path"jvm not found, point with_jvm_path to \[/path/to/\]jvm])
+-        fi
+         JVM_ONE_PATH_CHECK="$with_jvm_path"
+         AC_SUBST(JVM_ONE_PATH_CHECK)
+     else
diff --git a/patches/series b/patches/series
index 934c85b..0c79f1e 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ gb_SUPPRESS_TESTS.diff
 stop-shipping-mimelnk-desktop-files.diff
 icu-no-icu-config.diff
 ww8export-HAVE_MORE_FONTS.diff
+fix-JVM_ONE_PATH_CHECK.diff
diff --git a/rules b/rules
index b28a8de..dcd1fb9 100755
--- a/rules
+++ b/rules
@@ -144,11 +144,16 @@ PACKAGE_TTF_OPENSYMBOL=y
 BUILD_ONLY_EN_US=n
 ENABLE_JAVA=y
 ifeq "$(ENABLE_JAVA)" "y"
+  ifeq "$(DEB_HOST_ARCH)" "i386"
+  JDK=openjdk
+  JAVA_MAINVER=9
+  else
   JDK=default
   include /usr/share/java/java_defaults.mk
   ifneq "$(JDK)" "default"
     JAVA_MAINVER=7
   endif
+  endif
 endif
 JAVAHELPER_MIN_VERSION= (>= 0.37~)
 SYSTEM_STUFF += hunspell
@@ -582,10 +587,9 @@ ENABLE_PDFIUM=n
 endif
 
 IGNORE_MAKE_CHECK_FAILURES=-
-# disabled due to the Linux/Java Stack Clash fix regression...
-#ifeq (i386,$(DEB_HOST_ARCH))
-#  IGNORE_MAKE_CHECK_FAILURES:=
-#endif
+ifeq (i386,$(DEB_HOST_ARCH))
+  IGNORE_MAKE_CHECK_FAILURES:=
+endif
 ifeq (amd64,$(DEB_HOST_ARCH))
   IGNORE_MAKE_CHECK_FAILURES:=
 endif
@@ -1042,7 +1046,12 @@ 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,$(OOO_NO_JAVA_ARCHS))
+	BUILD_DEPS += , default-jdk (>= 1:1.6) $(filter-out !ia64 !i386,$(OOO_NO_JAVA_ARCHS))
+    ifeq (i386,$(findstring i386,$(OOO_JAVA_ARCHS)))
+#	BUILD_DEPS += , default-jdk (>= 1:1.9) [i386]
+	# hack.
+	BUILD_DEPS += , openjdk-9-jdk (>= 9.0.1+11-1) [i386]
+    endif
     ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
 	BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64]
     endif
@@ -1074,6 +1083,11 @@ ifeq "$(ENABLE_JAVA)" "y"
   else
 	BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
   endif
+  # force Java 9 with #876069 fixed on i386
+  ifeq "$(DEB_HOST_ARCH)" "i386"
+	CONFIGURE_FLAGS += --with-jvm-path=$(JAVA_HOME)
+	JAVA_RUNTIME_DEPENDS := openjdk-9-jre (>= 9.0.1+11-1)
+  else
 	JAVA_RUNTIME_DEPENDS = default-jre
   ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
     ifneq "$(DEB_HOST_ARCH)" "ia64"
@@ -1088,6 +1102,7 @@ ifeq "$(ENABLE_JAVA)" "y"
 	JAVA_RUNTIME_DEPENDS += | java6-runtime
 	# Suns Java "packages"
 	JAVA_RUNTIME_DEPENDS += | jre
+  endif
 export JAVA_HOME
 	CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
 	JAVA_COMMON_DEPENDS= , libreoffice-java-common

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