From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 12 Aug 2018 06:13:03 +0000 (+0100)
Subject: disable-java-in-odk-build-examples-on-zero-vm
X-Git-Tag: archive/raspbian/1%6.1.1_rc1-1+rpi1^2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9339316b5c027e68643e9fbf454ee305d6558172;p=libreoffice.git

disable-java-in-odk-build-examples-on-zero-vm


Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff
---

diff --git a/config_host.mk.in b/config_host.mk.in
index a813fa949d2..053d003a094 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -290,6 +290,7 @@ export JAVAFLAGS=@JAVAFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
+export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@
 export JAVA_HOME=@JAVA_HOME@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
 export JAVA_TARGET_VER=@JAVA_TARGET_VER@
diff --git a/configure.ac b/configure.ac
index 07ec0dd98e6..58f37a604bc 100644
Binary files a/configure.ac and b/configure.ac differ
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 363a8a41dea..bd05d4bba20 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\
 ifneq ($(filter $(OS),LINUX MACOSX),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \
     CustomTarget_build-examples \
+))
+ifneq ($(JAVA_HAS_ZERO_VM),y)
+$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \
     $(if $(ENABLE_JAVA),\
         CustomTarget_build-examples_java \
     ) \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4: