Makefile.in | 2 +-
configure.ac | 9 ++++++++-
distro-configs/LibreOfficeOssFuzz.conf | 9 ---------
3 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 4250958a492b300a52a83e68dd599f9c36c5086e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 20 14:31:36 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Aug 22 21:53:12 2021 +0200
ofz: prep for allowing oss-fuzz msan
dependencies need to be built with the msan flags so undo the
--with-system .a usage now that trying to squeeze into the 12 hour build
window isn't critical because the afl 6-8 hour build+check is disabled
Change-Id: I3729d37e0f028c5efe62ce5d66ea6fe636d3d0c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120788
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/Makefile.in b/Makefile.in
index 30607af43c89..e7f614698515 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -492,7 +492,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_icg Library_reflection
Library_invocadapt Library_bootstrap Library_introspection Library_stocservices
Library_xmlreader Library_gcc3_uno instsetoo_native 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 Library_sb Executable_pptfuzzer Execu
table_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_icg Library_reflection
Library_invocadapt Library_bootstrap Library_introspection Library_stocservices
Library_xmlreader Library_gcc3_uno instsetoo_native 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 Library_sb Executa
ble_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/configure.ac b/configure.ac
index a113ba458e60..ac226fd46ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -885,6 +885,9 @@ linux-gnu*|k*bsd*-gnu*)
build_skia=yes
test_gdb_index=yes
test_split_debug=yes
+ if test "$enable_fuzzers" = yes; then
+ test_system_freetype=no
+ fi
_os=Linux
;;
@@ -9012,7 +9015,11 @@ if test "$with_system_zlib" = "auto"; then
with_system_zlib="$with_system_libs"
;;
*)
- with_system_zlib=yes
+ if test "$enable_fuzzers" != "yes"; then
+ with_system_zlib=yes
+ else
+ with_system_zlib=no
+ fi
;;
esac
fi
diff --git a/distro-configs/LibreOfficeOssFuzz.conf
b/distro-configs/LibreOfficeOssFuzz.conf
index 4246c4c8f9da..410426c166b7 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -27,15 +27,6 @@
--disable-zxing
--with-idlc-cpp=cpp
--with-locales=en
---with-system-altlinuxhyph
---with-system-curl
---with-system-epoxy
---with-system-expat
---with-system-glm
---with-system-libexttextcat
---with-system-liblangtag
---with-system-openssl
---with-system-zlib
--without-fonts
--without-java
--without-webdav
