From 852cceace0bbdf846e29e86de7851822354edf02 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 24 Jan 2019 22:49:14 +0000
Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm

Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff
---
 config_host.mk.in |   1 +
 configure.ac      | Bin 459605 -> 459893 bytes
 odk/Module_odk.mk |   4 ++++
 3 files changed, 5 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index d288fa2d8e4..5d0cb37866e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -292,6 +292,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 7df23e2a42bcfef445030e6cee7b1f4d6bd878ae..c06416a585773ac9c63843653e353ef3e809431e 100644
GIT binary patch
delta 212
zcmccGCiAsJrlEzgg=q`(&W+O<wOQn*2M926>U%kcIePkqxCR9TxdKUr%wmPo;>^5s
zg_4X^g{ah`e1$OISWPZY1t7>wQ<#2!3A3U`dQobDf^H#L-WsGbkBgHNWKz6`V{m+w
zYmk3@n6GUm*YtzwKzkC{*#xK0Il>|`{X#km|MU$!tb)@7ScIkvJYg1@Zg7K<efr~#
n%%zf!&hf#aPQf7>=mt$^%w-L3U%81Hh*^M`b^FRqY-<7l6ct6P

delta 58
zcmey`A#=4&rlEzgg=q`(&W+O*pE4^?H@LybKK;ce=F;g;elYn?FUVtMX+OD{8HhnN
M>-LkI+13OA0QsdFS^xk5

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:
-- 
2.30.2