From ca014fdbd7f3e1c10d80eb2a91f9238f44d750e7 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 17 Dec 2021 16:57:04 +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 515938 -> 516247 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index efe5d54d10f..362ddb2c95f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -321,6 +321,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 c3f1eb05a656ba115f0ef5c74fd68045b9e1ffc3..18ef4713ee2694fc80adde0854eef18b192b0853 100644 GIT binary patch delta 210 zcmaE~Pk#DA`Gyw87N!>FEiBXWrZYZaQ8QQZatw3y^b2tf3J7uqk_wr{3Z=!FdFcuz z8L0|UsYUq;VZO1NTnb1aGfiRo!6X(%?)0M60tMYdkh19qpR$OFD1c0h_izl3k8%z2 zj}P;;t>l`1Fr3X`dfi1fk!gmkg42O6V4uEXF^kmnz7STC$qS6ww;#x331^(XriPtU h0A2rd#ucm~)AdSNxY~;gSb&%nh}pIm7qGw20|3nwL_Gii delta 55 zcmbP!Q2xFEiBXWrcc_zt~_~x5&QOA`7Gg#(|ta(2DQ&CWC3DUAZFV> JuaNy`9sq;17YYCX 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