[Libreoffice-commits] core.git: codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk idl/Executable_svidl.mk unoidl/Executable_unoidl-check.mk unoidl/Executable_unoidl-write.mk vcl/commonfuzzer.mk

[Caolán McNamara (via logerrit)]

 codemaker/Executable_cppumaker.mk |    4 ++++
 codemaker/Executable_javamaker.mk |    4 ++++
 idl/Executable_svidl.mk           |    4 ++++
 unoidl/Executable_unoidl-check.mk |    4 ++++
 unoidl/Executable_unoidl-write.mk |    4 ++++
 vcl/commonfuzzer.mk               |    1 +
 6 files changed, 21 insertions(+)

New commits:
commit 5b22433d79823372744038c5ae28094bc938fb48
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 2 12:05:15 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 2 19:54:28 2020 +0100

    ofz#20976 build-failure
    
    Change-Id: I31434d2b979aff20a53b164ffbb3d19247cd1ce3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89826
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index 41ca490718d7..f81577b732b0 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Executable_Executable,cppumaker))
 
 $(eval $(call gb_Executable_use_external,cppumaker,boost_headers))
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_Executable_use_external,cppumaker,dtoa))
+endif
+
 $(eval $(call gb_Executable_use_libraries,cppumaker,\
     unoidl \
     $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
index febfe9a71c29..135860e87dfe 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Executable_Executable,javamaker))
 
 $(eval $(call gb_Executable_use_external,javamaker,boost_headers))
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_Executable_use_external,javamaker,dtoa))
+endif
+
 $(eval $(call gb_Executable_use_libraries,javamaker,\
     unoidl \
     $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 98f447709a2c..fe0933795392 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_Executable_Executable,svidl))
 
 $(eval $(call gb_Executable_use_external,svidl,boost_headers))
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_Executable_use_external,svidl,dtoa))
+endif
+
 $(eval $(call gb_Executable_set_include,svidl,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/idl/inc \
diff --git a/unoidl/Executable_unoidl-check.mk b/unoidl/Executable_unoidl-check.mk
index 36dfc44de635..edd0d4b32aec 100644
--- a/unoidl/Executable_unoidl-check.mk
+++ b/unoidl/Executable_unoidl-check.mk
@@ -21,4 +21,8 @@ $(eval $(call gb_Executable_use_libraries,unoidl-check, \
     sal \
 ))
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_Executable_use_external,unoidl-check,dtoa))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/unoidl/Executable_unoidl-write.mk b/unoidl/Executable_unoidl-write.mk
index 9accb31ac14d..3ba2d9655563 100644
--- a/unoidl/Executable_unoidl-write.mk
+++ b/unoidl/Executable_unoidl-write.mk
@@ -21,4 +21,8 @@ $(eval $(call gb_Executable_use_libraries,unoidl-write, \
     sal \
 ))
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_Executable_use_external,unoidl-write,dtoa))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index b58a5bb5eccc..fc66386759c2 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -17,6 +17,7 @@ fuzzer_externals = \
     boost_system \
     boost_iostreams \
     curl \
+    dtoa \
     harfbuzz \
     graphite \
     cairo \