From 7ba7e88d897abf328bc990b5bbfa2700cf7b3ad0 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 1 Sep 2022 05:24:20 +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 533140 -> 533449 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 863fa263d62..8458da08049 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 73e4bf55acea8e8a6ac78be917890fe64bb1e2b2..65c450612230a31990da03aa92677d16e029e135 100644 GIT binary patch delta 216 zcmbPoRN>@tg@zW!7N!>FEi5mmPhTj+s%Ea@lhp#KJj3QoVUiHUo9%r_SP=?~tsuunhlz{We-Aeenx4HNrz v;TbI9jFaaSaSDLk6z_pBXnG+lQ^@r5y)10)hi0+>F)I+WZ9g=V{Za=2yQE1I delta 69 zcmX?kTw%&lg@zW!7N!>FEi5mmPd_x7U1qXDF#EI`Cid;RGg-nJr{{z)`%XW=%EUVT Yd@l=I`}bKaK+FonY}>!jV!zY@0Kh*Sn*aa+ 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