From 88d493771950d465bb100faf2f23bcbfe1ffc3e1 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 27 Sep 2024 17:38:49 +0200 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 567780 -> 568089 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 79993dc932c..e86b2aeb7fe 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -364,6 +364,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 52087403862674b1115b8360abb477de9ea3f291..32facba2ab3adbca0736e55669a2982cbdbd798b 100644 GIT binary patch delta 208 zcmaEIS!w1qrG^&97N!>FEiBn*rx$Kv5}9_EN!ZNGG0f4^FT^z{AjlO+Dr6Qblon^^ zr7M(Vq$)(E7Ue61`NnE;DIkH&G==H+53?xpq!*OyBT=iGBOjvn=6^ m({uJQaSDK36YqgAVEV>7=8$%~^DIEj3dC&N?as3=y9EHFB1gFZ delta 65 zcmbPvP3g&HrG^&97N!>FEiBn*r(eq9P@cZw1rz)B_2*c^8K-;8v-wV|XJ(x)e}#ps Uz4ihN5VHa?+xFTE>~n4b0D-C-N&o-= diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 55077be0a8f..a0fb8de8c22 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