Makefile.in | 2 +-
codemaker/Executable_cppumaker.mk | 5 ++++-
codemaker/Executable_javamaker.mk | 5 ++++-
idl/Executable_svidl.mk | 5 ++++-
unoidl/Executable_unoidl-check.mk | 5 ++++-
unoidl/Executable_unoidl-write.mk | 5 ++++-
6 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit 28555fc345ac2ccdda0e4e0f3c812c646befe68b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Feb 12 15:44:39 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Feb 12 21:21:09 2021 +0100
fix fuzzer build
Change-Id: I41df4af812cd225a0bd8e49df9e8b3c322698d28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110825
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/Makefile.in b/Makefile.in
index f56845c16a82..860240a8aa51 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -481,7 +481,7 @@ $(foreach ide,\
eclipsecdt,\
$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
-fuzzers: StaticLibrary_dtoa Library_sal Library_salhelper Library_reg
Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag
Library_cppuhelper Library_comphelper StaticLibrary_ulingu
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng
Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp
Library_ucbhelper Rdb_services udkapi offapi Library_gie Library_icg
Library_reflection Library_invocadapt Library_bootstrap Library_introspection
Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native
more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs
StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw
StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math Library_forui
Library_binaryurp Library_io Library_invocation Library_namingservice
Library_proxyfac Library_uuresolver Module_ure Library_wpftwriter Executable_ppt
fuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer
Executable_pptxfuzzer Executable_htmlfuzzer Executable_rtffuzzer
Executable_mmlfuzzer Executable_mtpfuzzer Executable_olefuzzer
Executable_lwpfuzzer Executable_hwpfuzzer Executable_wmffuzzer
Executable_dxffuzzer Executable_sftfuzzer Executable_svmfuzzer
Executable_tiffuzzer Executable_epsfuzzer Executable_jpgfuzzer
Executable_metfuzzer Executable_bmpfuzzer Executable_giffuzzer
Executable_pngfuzzer Executable_602fuzzer Executable_tgafuzzer
Executable_pcxfuzzer Executable_psdfuzzer Executable_ppmfuzzer
Executable_pcdfuzzer Executable_rasfuzzer Executable_pctfuzzer
Executable_xpmfuzzer Executable_xbmfuzzer
+fuzzers: StaticLibrary_dtoa StaticLibrary_zlib Library_sal Library_salhelper
Library_reg Library_store Library_unoidl codemaker Library_cppu
Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng
Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp
Library_ucbhelper Rdb_services udkapi offapi Library_gie Library_icg
Library_reflection Library_invocadapt Library_bootstrap Library_introspection
Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native
more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs
StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw
StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math Library_forui
Library_binaryurp Library_io Library_invocation Library_namingservice
Library_proxyfac Library_uuresolver Module_ure Library_wpftwr
iter Executable_pptfuzzer Executable_cgmfuzzer Executable_ww2fuzzer
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer
Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer
Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer
Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer
Executable_xlsxfuzzer Executable_pptxfuzzer Executable_htmlfuzzer
Executable_rtffuzzer Executable_mmlfuzzer Executable_mtpfuzzer
Executable_olefuzzer Executable_lwpfuzzer Executable_hwpfuzzer
Executable_wmffuzzer Executable_dxffuzzer Executable_sftfuzzer
Executable_svmfuzzer Executable_tiffuzzer Executable_epsfuzzer
Executable_jpgfuzzer Executable_metfuzzer Executable_bmpfuzzer
Executable_giffuzzer Executable_pngfuzzer Executable_602fuzzer
Executable_tgafuzzer Executable_pcxfuzzer Executable_psdfuzzer
Executable_ppmfuzzer Executable_pcdfuzzer Executable_rasfuzzer
Executable_pctfuzzer Executable_xpmfuzzer Executable_xbmfuzzer
endif # MAKE_RESTARTS
diff --git a/codemaker/Executable_cppumaker.mk
b/codemaker/Executable_cppumaker.mk
index f81577b732b0..0e17378c7e74 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -12,7 +12,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))
+$(eval $(call gb_Executable_use_externals,cppumaker,\
+ dtoa \
+ zlib \
+))
endif
$(eval $(call gb_Executable_use_libraries,cppumaker,\
diff --git a/codemaker/Executable_javamaker.mk
b/codemaker/Executable_javamaker.mk
index 135860e87dfe..e1b08ccff10d 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -12,7 +12,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))
+$(eval $(call gb_Executable_use_externals,javamaker,\
+ dtoa \
+ zlib \
+))
endif
$(eval $(call gb_Executable_use_libraries,javamaker,\
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index b710f0542429..54676af66860 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -22,7 +22,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))
+$(eval $(call gb_Executable_use_externals,svidl,\
+ dtoa \
+ zlib \
+))
endif
$(eval $(call gb_Executable_set_include,svidl,\
diff --git a/unoidl/Executable_unoidl-check.mk
b/unoidl/Executable_unoidl-check.mk
index edd0d4b32aec..671ee38de5f8 100644
--- a/unoidl/Executable_unoidl-check.mk
+++ b/unoidl/Executable_unoidl-check.mk
@@ -22,7 +22,10 @@ $(eval $(call gb_Executable_use_libraries,unoidl-check, \
))
ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_Executable_use_external,unoidl-check,dtoa))
+$(eval $(call gb_Executable_use_externals,unoidl-check,\
+ dtoa \
+ zlib \
+))
endif
# vim: set noet sw=4 ts=4:
diff --git a/unoidl/Executable_unoidl-write.mk
b/unoidl/Executable_unoidl-write.mk
index 3ba2d9655563..cc15bc34d004 100644
--- a/unoidl/Executable_unoidl-write.mk
+++ b/unoidl/Executable_unoidl-write.mk
@@ -22,7 +22,10 @@ $(eval $(call gb_Executable_use_libraries,unoidl-write, \
))
ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_Executable_use_external,unoidl-write,dtoa))
+$(eval $(call gb_Executable_use_externals,unoidl-write,\
+ dtoa \
+ zlib \
+))
endif
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
