From 763228cfe3ca60ea07047fa09052f0c6d151f855 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 27 Nov 2023 19:15:44 +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 540333 -> 540642 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 22e2ea74cb4..07b43814409 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -357,6 +357,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 13abf9900f89cf57745b5bc270d1994a42703cb6..c9725d807cd8dcb2d7199588a3f39a0c5b284a7c 100644 GIT binary patch delta 205 zcmZ4cSK-lrg@zW!7N!>FEi6x#Pd_Nbsy1Cn#=x%Pl z0usnfQ<#2tA&Vk+dQobDf^H#5+4M#^RFEi6x#Pj5QFCNllOFGjKL8Y@}C8K=i2v-wUB5N2X+f3u1O Ph(R>l_BX58zfA!ENrM}1 diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 073f048998f..30c56dca268 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