From adbfec9bd029cbfc74a247ebd8659606a27fd535 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 20 Mar 2020 15:23:39 +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 465742 -> 466030 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 01ee79600b2..49e67039e90 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -296,6 +296,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 eba54f0a5afbb68a48e0d44d1a75361ef118e038..920ebcd6300145566e16b0b5c3fb3170c9848bce 100644 GIT binary patch delta 220 zcmX@NP3GMWnT8g|7N#xC*?*^hTi!<}m z6-qKv6{1p$@)g2-V>P)r6@VZ!O<{WAcVHihyfsK=9v3Gk$fS4=$Kd!V z*C7A+FkjnBuIYiUOtRA_NU;h{-xJ3oGCjeSiEp}qHzU{d20s>#>GmEhLem9qvxrQx wW}iOwFLSY^qjP+4s8eu=2D)L>FD9~tOk-l8x{^e5X4kv#?HAU}oWJZ~4y* P#4JF}y1nH;+bbCW3~m`P 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