From b5e76215d131faba245c7e639f829f476cf36ee2 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Tue, 10 Jul 2018 20:07:55 +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 450505 -> 450793 bytes odk/CustomTarget_build-examples.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index bc21158c23e..4502165881f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -284,6 +284,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 724240baa9213ffb0f1a0ee89b1384891af88834..35c45173397f448d9843946aefa3f51fd61cf00f 100644 GIT binary patch delta 203 zcmX@PU;5=i>4p}@7N#xC)B2|i^0KHIsCYSsIePkqxCR9TxdKUr%wmPo;>^5sg_4X^ zg{ah`e1$OISWPZY1t7>wQ<$#M#;mB3UX)s(pj!x*w+5-q4p}@7N#xC)B2}R+RUmv`GFbx^rI7)OQ(OSXYp-cG?5vIS%8>z`=W_# G?*0IF0T%-R diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk index f7dc1db1e30..338a3bd02c9 100644 --- a/odk/CustomTarget_build-examples.mk +++ b/odk/CustomTarget_build-examples.mk @@ -32,6 +32,7 @@ my_example_dirs = \ ifeq ($(ENABLE_JAVA),TRUE) +ifneq ($(JAVA_HAS_ZERO_VM),y) my_example_dirs += \ DevelopersGuide/BasicAndDialogs/CreatingDialogs \ DevelopersGuide/Charts \ @@ -77,6 +78,7 @@ my_example_dirs += \ java/ToDo \ endif +endif # java/ConverterServlet \ # java/EmbedDocument/Container1 \ -- 2.30.2