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 5ea4fd9f20b87ef57b5f603ecc3a53c2b357a50a..62b85b27f2391a6242005fff3acc845cdc61f2e5 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -359,6 +359,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 02058e84abed88e818a6c36fde0a2d3ef0472d35..e94dc6048e7d7986d51f8ceed07bc7a58438e923 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 073f048998f3a30849864fea03d6e55b88ff154a..30c56dca268030a8466f3efca86411b2a57b136f 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: