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 efe5d54d10fddfa465f529f886bb610ae0df0156..362ddb2c95f7be100e0d1f2300226c3c5b7301c3 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -321,6 +321,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@
 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_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@

diff --git a/configure.ac b/configure.ac
index c3f1eb05a656ba115f0ef5c74fd68045b9e1ffc3..18ef4713ee2694fc80adde0854eef18b192b0853 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 0d5fca58d2ce2c6b2eeadfd88b56ef98e0e5f586..6bbe1e826e314250e4a8bb5778326aae75130fd1 100644 (file)
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -59,10 +59,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: