From 8b68bee5b60d41bcd3c03540628d804c66fbe6b5 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 6 Mar 2025 17:41:13 +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 581762 -> 582071 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 8f243c2b339..332172bfe2e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -377,6 +377,7 @@ export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ 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 37961507738df415c97863d9ec9224fb78d8eda7..a1cf9abe4be38b2e81f28a70b0e01d4cff53d9a0 100644 GIT binary patch delta 212 zcmZoVsJ#8KazhJa3sVd87MA(nrZ2Q%m7D%y0yC$Xmt&Ztr(cL`P(Y9?kW|PlRwymb z%u81&$w*a*N-fG)2=k5A$7 delta 60 zcmdmfSh?w-azhJa3sVd87MA(nrXQ?gSDw6~hkg6w?=0br(|;ad^PO%W$->&c{3i<# OgJ`zx%YU*9yZ`_)PaB8; diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 500348a7ea6..9029cb32b98 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -60,10 +60,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