From 2ef2b6484e551c6311bc8a1fef4d4c9983fe7d16 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 12 Dec 2019 21:52:05 +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 466003 -> 466291 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 984165ef35e..c8602170598 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -301,6 +301,7 @@ export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ 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_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ diff --git a/configure.ac b/configure.ac index 26ed1696f47c096d0c5dbf1514593d35e49a57f9..23bb414bf00f0924fbc01087d06cba4d0ae43a4a 100644 GIT binary patch delta 215 zcmcb-L+0}?nT8g|7N#xCr{7K&EM!qLQ1NmMbM*8JaSaLxas`qKnZ*jF#hH2O3MCn- z3Q?&=`3hmav6@_*3P6yVrZC<1A+w@-dQobDf^H#L-WsGbkBgHNWKz6`V{m+wYmk3@ zn6GW+^uTQ_;?qC;XO*1(cRHK!^n`6J9Mca-GYL*l@Mh(hx}J@DdVv=U`*Z^hHj&8* t-0ai8zGW_zaCD9j4s{9+(LghBI^zr0(Dps=n1PrDh*`JqdB-+g7XWaJN|OKp delta 58 zcmeyoOXl(pnT8g|7N#xCr{7LDDrJ+Ieqa_G@ARMVn9HV{E@JYX{@@Wacl)FF%s|Wn N#H`yNy=R-K3jiqc97+HH diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 363a8a41dea..bd05d4bba20 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -62,10 +62,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