ofz#20976 build-failure

Change-Id: I6fc81e6ef13f77dea410f95e159a932089603aeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89801
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2020-03-02 20:01:45 +01:00
parent e2a6efe230
commit 133eafab9b
6 changed files with 21 additions and 0 deletions

View file

@ -11,6 +11,10 @@ $(eval $(call gb_Executable_Executable,cppumaker))
$(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) $(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,\ $(eval $(call gb_Executable_use_libraries,cppumaker,\
unoidl \ unoidl \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \

View file

@ -11,6 +11,10 @@ $(eval $(call gb_Executable_Executable,javamaker))
$(eval $(call gb_Executable_use_external,javamaker,boost_headers)) $(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,\ $(eval $(call gb_Executable_use_libraries,javamaker,\
unoidl \ unoidl \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \

View file

@ -21,6 +21,10 @@ $(eval $(call gb_Executable_Executable,svidl))
$(eval $(call gb_Executable_use_external,svidl,boost_headers)) $(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,\ $(eval $(call gb_Executable_set_include,svidl,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(SRCDIR)/idl/inc \ -I$(SRCDIR)/idl/inc \

View file

@ -21,4 +21,8 @@ $(eval $(call gb_Executable_use_libraries,unoidl-check, \
sal \ sal \
)) ))
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_Executable_use_external,unoidl-check,dtoa))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

View file

@ -21,4 +21,8 @@ $(eval $(call gb_Executable_use_libraries,unoidl-write, \
sal \ sal \
)) ))
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_Executable_use_external,unoidl-write,dtoa))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

View file

@ -17,6 +17,7 @@ fuzzer_externals = \
boost_system \ boost_system \
boost_iostreams \ boost_iostreams \
curl \ curl \
dtoa \
harfbuzz \ harfbuzz \
graphite \ graphite \
cairo \ cairo \