From 4549f5c7369fc047b121ed4738437f115dc7dab9 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 28 Jul 2022 21:58:57 +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 533935 -> 534244 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 67370508bde..b6eb1e047d9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -350,6 +350,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 9d177454eb2f50dc844c268f4bee67e02cf4b62d..dd37ae669cdbe6164353488443e31b2cdb23e3d8 100644 GIT binary patch delta 223 zcmZ2~TH(oAg@zW!7N!>FEiCh9OgG|Z6`8i1P1wxKG0f4^FT^z{AjlO+Dr6Qblon^^ zr7M(Vq$)(E7Ue61`NnE;DIkH&G==Gg6Ic{^(u-0H6m$#0%BCxxWE2wynHKNi7#ttv z8sr}z=4)HYHT~jK7P;vL2buY%KX}X{G5tdT3alaRg|k?Im=%cGwinJ~x9bJ~PM=8R delta 56 zcmaEIR$={Vg@zW!7N!>FEiCh9OgB2iqC8!IiHUvtqnRw>jMF9Ov&6J-n9TyjtU%1R KeZy>alWqWkMiyiM 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