Makefile.in                            |    2 +-
 distro-configs/LibreOfficeOssFuzz.conf |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 30f41d99af6cf84b5993d5c5c24fc49ef39bd756
Author:     Caolán McNamara <[email protected]>
AuthorDate: Fri Dec 3 14:50:07 2021 +0000
Commit:     Caolán McNamara <[email protected]>
CommitDate: Fri Dec 3 17:28:50 2021 +0100

    ofz#41602 fix more build failure
    
    since...
    
    commit f9e79a91f15e10ededad0f103c4ffe0ca38fcb31
    Date:   Tue May 18 01:11:41 2021 +0200
    
        Fix --disable-avmedia for DESKTOP build
    
    Change-Id: I31404c1a4c2ba71fb47388d87b59ecbee87ff603
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126324
    Tested-by: Caolán McNamara <[email protected]>
    Reviewed-by: Caolán McNamara <[email protected]>

diff --git a/Makefile.in b/Makefile.in
index 5b7430869bca..f8c0bc59dcb3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -492,7 +492,7 @@ $(foreach ide,\
         eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
 
-fuzzers: StaticLibrary_dtoa StaticLibrary_zlib StaticLibrary_libjpeg-turbo 
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_w
 pftwriter Library_sb Library_file 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 Executabl
 e_dbffuzzer
+fuzzers: StaticLibrary_dtoa StaticLibrary_zlib StaticLibrary_libjpeg-turbo 
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_w
 pftwriter Library_sb Library_file Library_avmedia 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_xbm
 fuzzer Executable_dbffuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/distro-configs/LibreOfficeOssFuzz.conf 
b/distro-configs/LibreOfficeOssFuzz.conf
index ea868ec4b086..ff201815efe5 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -2,6 +2,7 @@
 --enable-ld=gold
 --disable-dynamic-loading
 --disable-runtime-optimizations
+--disable-avmedia
 --disable-scripting
 --disable-cairo-canvas
 --disable-cmis

Reply via email to