From 518ae0a41519404a0007f9a953ebb090833ddd98 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 28 Nov 2022 17:32:19 +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 533694 -> 534003 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 18db2b69081..a8cb7e5a6db 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 38a5ba2df37cbe6074ba82176c72b5247cb33c91..f4f1a2dab01e73c5d2aae1b4da39d7e922010108 100644 GIT binary patch delta 223 zcmdmYQsMJyg@zW!7N!>FEi5x;PA^=}S!@0YWQOgGrX!arT0f{k~&&uF;kc z@=klj$hZB_OqOuQ$#aT01whV<_du95U9g!oWV*q87OwWv*(^ZJ3dC&NOJ}otb^-vk C^h?VC delta 46 zcmex-T4CQwg@zW!7N!>FEi5x;Zr?PErIB&EPCrXT`?5JKK+FonY}=R3VfXC>0N>XW A_y7O^ 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