From 93e1e2073d0e6a63b103cd9f9a6fc763e32bcb60 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 2 Jun 2022 16:51:28 +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 528766 -> 529075 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 8226e423069..330116d592f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -331,6 +331,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 50dbf497d41af1edd65f9c0104dd1cb6679d7618..9124b83f6e86ba077cb560207859cd48bad77e75 100644 GIT binary patch delta 230 zcmeyjNMZ9*g@zW!7N!>FEi5Z)rhimt5t(if%`RlF;^i3T=;;^Y8Wa%Z3M3UWixosRatUgzug@zW!7N!>FEi5Z)wjZixX=I$<;mhVby`Y(ezkOFd3lOscG28ZC_3S?< F0RSzs70>_x 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