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 8f243c2b339ce6884d748babb2973dfcf8cf5a19..332172bfe2ea3da73be0c35ab12aa947e843733b 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -377,6 +377,7 @@ export JAVACFLAGS=@JAVACFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
+export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@
 export JAVA_HOME=@JAVA_HOME@
 export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@

diff --git a/configure.ac b/configure.ac
index 3cbf31f87cc23e44c6696ff161a294c89d102bea..089b44d72aee9970c1eafd7f21b3424c03d52cc9 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 500348a7ea618a3fde7059ca16953082812e3774..9029cb32b983a6751b72ef06abe4ce8671da2c2d 100644 (file)
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -60,10 +60,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: