From 9339316b5c027e68643e9fbf454ee305d6558172 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 12 Aug 2018 07:13:03 +0100 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 459008 -> 459296 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index a813fa949d2..053d003a094 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -290,6 +290,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 07ec0dd98e6974ffd5b4287e44a8e7defa67af84..58f37a604bcc9b861976cb51a1656abac8a663ec 100644 GIT binary patch delta 188 zcmZo@l3CCq)6l}$!nB3CZ~gR#+AM0*CoNFejQC~Bk^r4}gY7J}uiK`QgOI61u>!yMy19E0PdT!Z}M!+dQkxuzE~vgl8L zbC^|RdIKX1|8xgdHo@rzKbg6wH*92*o_39qefo~|%%zf!&hf#aPQf7>=w?h0yvr8U TUb}%Ah*^M`b$jgww&nl;%%?vF delta 52 zcmZ3`BGb?$)6l}$!nB3CZ~gS9tE|e?t}(Jt-@Adiboy0oR^Rqn8<~Na1&CR<&)Ue= G761S}?G`Nn 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