From b1cf435b4794c6d4429ebfbb3f73b28af7f10e20 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 1 Nov 2020 21:20:53 +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 483875 -> 484163 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 635a590d12f..301867380ee 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -321,6 +321,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 0d399c1058839a23aeec49660d4d868d12d0ceb1..ecf0ece9248d5c819ad23a7d796b45fcbc4f7cc3 100644 GIT binary patch delta 222 zcmZ2{ME3A8*@hOz7N!>FEiBT!(+@SXh)fsoViMN(atw3y^b2tf3J7uqk_wr{3Z=!F zdFcuz8L0|UsYUq;VZO1NT$~C(keQ}1J?|@vqDFdAYJq}oAz0oTq%x0-lM`f8yoY0O ze3WaDe|(s)Z6(+A##C1Q$#XPCrYl@w5uC2j&&WRA!G@J(`gvY9{>gIu?9&@wv5HJ@ ySOgSzFEiBT!(?A|7avRU^rwqif~H>(V&Q5x;b#G2 ORv>2EZo<#b9|8cMClgEn 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