From 8cfebca843c9d486f4796e024d01c9c61c9ddb30 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 3 Mar 2022 17:24:16 +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 527223 -> 527532 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 3a8af58ae29668420c3e0161f4c5c5d84627a806..860d0b32040a1510a2e8c1ba2ad030b339d0cc4e 100644 GIT binary patch delta 208 zcmex9O<~PUg@zW!7N!>FEi6x~rzgES?j)~LE%Q4K+(=Ws|C?LocNGfC&E0h*z z=A|o?WTYxYr55EYg!#s5aw#Bz%ru4R0tGCJJn2QL1q!-_U}e)CcQcAj59noK<8=&< zk8%z2j}P;;t>l`1aSx;7^n?sH{^=VGSVg99=wULNp75AmWby(d_U-&NEa8lkvr9My lK<MSNow_79eH?Vz%vvYT38;0szbYMa%#I delta 64 zcmZ28Q{nqGg@zW!7N!>FEi6x~r%y6vlbP&L%RYI55&L${T9$Ce>EBb>eWxFAV`goC RTgL*#AewFa+dB6By#PF+8h!u( 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