From 3915d96d0dd3df10199a304147ed8f52d1927e96 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 29 Dec 2022 23:22:03 +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 533609 -> 533918 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 3e1ae9f47e5..1b3d50b1339 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -349,6 +349,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 5dab80bf8b77216482a90e49eced4091aabb7858..a1d5a1665ae29d2491524017abed6ec887f3745f 100644 GIT binary patch delta 214 zcmaEPLSf!%g@zW!7N!>FEi7MVOczXK5}AHLm{n-HLJy0Ga%pj9Ub;d_Myf(oYEiyI zm~X5mmjV*VOjDTtb`pysPkK>mfr4%!SlM*N0%o!4@vB(acpZb|qg;dhFEi7MVOy5|^raXPYCPwz{7PDBw8K-B5GW$;dP|M8P{%1A| P5QAv8?SE#oFX{vUE)p9J diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 0d5fca58d2c..6bbe1e826e3 100644 --- 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: -- 2.30.2