[Libreoffice-commits] core.git: external/boost external/breakpad external/clucene external/epoxy external/expat external/gpgmepp external/graphite external/hunspell external/hyphen external/libcmis external/libetonyek external/libexttextcat external/libmwaw external/libnumbertext external/libodfgen external/liborcus external/libpng external/librevenge external/libstaroffice external/libwpd external/libwpg external/libwps external/mariadb-connector-c external/mdnsresponder external/mythes external/neon external/pdfium external/poppler external/redland external/ucpp external/zlib solenv/gbuild
Luboš Luňák (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 24 11:47:32 UTC 2019
external/boost/StaticLibrary_boost_date_time.mk | 2 -
external/boost/StaticLibrary_boost_filesystem.mk | 2 -
external/boost/StaticLibrary_boost_iostreams.mk | 2 -
external/boost/StaticLibrary_boost_locale.mk | 2 -
external/boost/StaticLibrary_boost_system.mk | 2 -
external/breakpad/StaticLibrary_breakpad.mk | 2 -
external/clucene/Library_clucene.mk | 11 ----------
external/epoxy/Library_epoxy.mk | 11 ----------
external/expat/StaticLibrary_expat.mk | 7 ------
external/expat/StaticLibrary_expat_x64.mk | 2 -
external/gpgmepp/Library_gpgmepp.mk | 2 -
external/graphite/StaticLibrary_graphite.mk | 2 -
external/hunspell/StaticLibrary_hunspell.mk | 2 -
external/hyphen/StaticLibrary_hyphen.mk | 2 -
external/libcmis/StaticLibrary_libcmis.mk | 2 -
external/libetonyek/Library_etonyek.mk | 2 -
external/libexttextcat/StaticLibrary_libexttextcat.mk | 2 -
external/libmwaw/Library_mwaw.mk | 2 -
external/libnumbertext/StaticLibrary_libnumbertext.mk | 2 -
external/libodfgen/Library_odfgen.mk | 2 -
external/liborcus/Library_orcus-parser.mk | 2 -
external/liborcus/Library_orcus.mk | 2 -
external/libpng/StaticLibrary_libpng.mk | 2 -
external/librevenge/Library_revenge.mk | 2 -
external/libstaroffice/Library_staroffice.mk | 2 -
external/libwpd/Library_wpd.mk | 2 -
external/libwpg/Library_wpg.mk | 2 -
external/libwps/Library_wps.mk | 2 -
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 2 -
external/mdnsresponder/StaticLibrary_mDNSResponder.mk | 2 -
external/mythes/StaticLibrary_mythes.mk | 2 -
external/neon/Library_neon.mk | 8 -------
external/pdfium/Library_pdfium.mk | 10 ---------
external/poppler/StaticLibrary_poppler.mk | 2 -
external/redland/Library_raptor.mk | 2 -
external/redland/Library_rasqal.mk | 2 -
external/redland/Library_rdf.mk | 2 -
external/ucpp/Executable_ucpp.mk | 8 -------
external/zlib/StaticLibrary_zlib.mk | 2 -
external/zlib/StaticLibrary_zlib_x64.mk | 2 -
solenv/gbuild/CppunitTest.mk | 1
solenv/gbuild/Executable.mk | 1
solenv/gbuild/Library.mk | 1
solenv/gbuild/LinkTarget.mk | 7 ++++++
solenv/gbuild/StaticLibrary.mk | 1
solenv/gbuild/platform/com_GCC_class.mk | 6 ++---
solenv/gbuild/platform/com_GCC_defs.mk | 2 +
solenv/gbuild/platform/com_MSC_class.mk | 5 ++--
solenv/gbuild/platform/com_MSC_defs.mk | 2 +
49 files changed, 61 insertions(+), 88 deletions(-)
New commits:
commit cb7a39ac64253a6d0e11cfe1837ad3da2465c38e
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri May 24 11:45:26 2019 +0200
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Fri May 24 13:46:03 2019 +0200
disable warnings in external libs
As in, really disable, so that they do not even show. This moreover
avoids tons of D9025 warnings from MSVC about overriding -W4 with -w.
Change-Id: Ia2e72fd72d883d91bdd89e467ee42f259e2ae033
Reviewed-on: https://gerrit.libreoffice.org/72899
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
diff --git a/external/boost/StaticLibrary_boost_date_time.mk b/external/boost/StaticLibrary_boost_date_time.mk
index 9f871ee164fe..573947fd71ee 100644
--- a/external/boost/StaticLibrary_boost_date_time.mk
+++ b/external/boost/StaticLibrary_boost_date_time.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,boost_date_time))
$(eval $(call gb_StaticLibrary_use_unpacked,boost_date_time,boost))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_date_time))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_date_time))
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost_date_time,\
diff --git a/external/boost/StaticLibrary_boost_filesystem.mk b/external/boost/StaticLibrary_boost_filesystem.mk
index 024308abd320..a49f06b6dba5 100644
--- a/external/boost/StaticLibrary_boost_filesystem.mk
+++ b/external/boost/StaticLibrary_boost_filesystem.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,boost_filesystem))
$(eval $(call gb_StaticLibrary_use_unpacked,boost_filesystem,boost))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_filesystem))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_filesystem))
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost_filesystem,\
diff --git a/external/boost/StaticLibrary_boost_iostreams.mk b/external/boost/StaticLibrary_boost_iostreams.mk
index f3049ba2570e..0884a5aee2cd 100644
--- a/external/boost/StaticLibrary_boost_iostreams.mk
+++ b/external/boost/StaticLibrary_boost_iostreams.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,boost_iostreams))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_iostreams))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_iostreams))
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost_iostreams,\
diff --git a/external/boost/StaticLibrary_boost_locale.mk b/external/boost/StaticLibrary_boost_locale.mk
index 520131fb9174..5481097728bd 100644
--- a/external/boost/StaticLibrary_boost_locale.mk
+++ b/external/boost/StaticLibrary_boost_locale.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,boost_locale))
$(eval $(call gb_StaticLibrary_use_unpacked,boost_locale,boost))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_locale))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_locale))
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost_locale,\
diff --git a/external/boost/StaticLibrary_boost_system.mk b/external/boost/StaticLibrary_boost_system.mk
index 03970afa41d3..e4b05d7b5cde 100644
--- a/external/boost/StaticLibrary_boost_system.mk
+++ b/external/boost/StaticLibrary_boost_system.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,boost_system))
$(eval $(call gb_StaticLibrary_use_unpacked,boost_system,boost))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_system))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_system))
# disable "auto link" "feature" on MSVC
$(eval $(call gb_StaticLibrary_add_defs,boost_system,\
diff --git a/external/breakpad/StaticLibrary_breakpad.mk b/external/breakpad/StaticLibrary_breakpad.mk
index 257db329a8b5..fc5d3251f5bd 100644
--- a/external/breakpad/StaticLibrary_breakpad.mk
+++ b/external/breakpad/StaticLibrary_breakpad.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,breakpad))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,breakpad))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,breakpad))
$(eval $(call gb_StaticLibrary_use_unpacked,breakpad,breakpad))
diff --git a/external/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk
index f04961398797..a6dc8576f0b1 100644
--- a/external/clucene/Library_clucene.mk
+++ b/external/clucene/Library_clucene.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Library_use_external,clucene,zlib))
$(eval $(call gb_Library_use_unpacked,clucene,clucene))
-$(eval $(call gb_Library_set_warnings_not_errors,clucene))
+$(eval $(call gb_Library_set_warnings_disabled,clucene))
$(eval $(call gb_Library_set_include,clucene,\
-I$(call gb_UnpackedTarball_get_dir,clucene)/inc/internal \
@@ -35,15 +35,6 @@ $(eval $(call gb_Library_add_defs,clucene, \
-D_HAS_AUTO_PTR_ETC=1 \
))
-# clucene is riddled with warnings... let's spare use
-# the pointless spamming
-$(eval $(call gb_Library_add_cxxflags,clucene,\
- -w \
-))
-$(eval $(call gb_Library_add_cflags,clucene,\
- -w \
-))
-
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,clucene,\
-lm \
diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk
index 12424b1af13f..81c35d695997 100644
--- a/external/epoxy/Library_epoxy.mk
+++ b/external/epoxy/Library_epoxy.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,epoxy))
$(eval $(call gb_Library_use_unpacked,epoxy,epoxy))
-$(eval $(call gb_Library_set_warnings_not_errors,epoxy))
+$(eval $(call gb_Library_set_warnings_disabled,epoxy))
$(eval $(call gb_Library_set_include,epoxy,\
-I$(call gb_UnpackedTarball_get_dir,epoxy)/include \
@@ -19,15 +19,6 @@ $(eval $(call gb_Library_set_include,epoxy,\
$$(INCLUDE) \
))
-# epoxy is riddled with warnings... let's spare us
-# the pointless spamming
-$(eval $(call gb_Library_add_cxxflags,epoxy,\
- -w \
-))
-$(eval $(call gb_Library_add_cflags,epoxy,\
- -w \
-))
-
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,epoxy,\
-ldl \
diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk
index 31d03d03102e..65b1dcb5568a 100644
--- a/external/expat/StaticLibrary_expat.mk
+++ b/external/expat/StaticLibrary_expat.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,expat))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,expat))
$(eval $(call gb_StaticLibrary_use_unpacked,expat,expat))
@@ -42,11 +42,6 @@ $(eval $(call gb_StaticLibrary_add_defs,expat,\
))
endif
-# suppress warning spam
-$(eval $(call gb_StaticLibrary_add_cflags,expat,\
- -w \
-))
-
$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
UnpackedTarball/expat/lib/loadlibrary \
UnpackedTarball/expat/lib/xmlparse \
diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk
index 4f92d0fb284e..e5b1e51ab994 100644
--- a/external/expat/StaticLibrary_expat_x64.mk
+++ b/external/expat/StaticLibrary_expat_x64.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,expat_x64))
$(eval $(call gb_StaticLibrary_set_x64,expat_x64,YES))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_x64))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,expat_x64))
$(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat))
diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk
index 8a69e954bf31..a7d0ba349c9b 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_externals,gpgmepp,\
$(eval $(call gb_LinkTarget_use_external_project,\
$(call gb_Library_get_linktarget,gpgmepp),gpgmepp,full))
-$(eval $(call gb_Library_set_warnings_not_errors,gpgmepp))
+$(eval $(call gb_Library_set_warnings_disabled,gpgmepp))
$(eval $(call gb_Library_set_include,gpgmepp,\
-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk
index a8f8bce7cc6f..ee233a10b028 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,graphite))
$(eval $(call gb_StaticLibrary_use_unpacked,graphite,graphite))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,graphite))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,graphite))
$(eval $(call gb_StaticLibrary_set_include,graphite,\
-I$(call gb_UnpackedTarball_get_dir,graphite/include) \
diff --git a/external/hunspell/StaticLibrary_hunspell.mk b/external/hunspell/StaticLibrary_hunspell.mk
index 895d28e29968..02d534f69169 100644
--- a/external/hunspell/StaticLibrary_hunspell.mk
+++ b/external/hunspell/StaticLibrary_hunspell.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,hunspell,hunspell))
$(eval $(call gb_StaticLibrary_use_external,hunspell,icu_headers))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,hunspell))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,hunspell))
$(eval $(call gb_StaticLibrary_add_defs,hunspell,\
-DHUNSPELL_STATIC \
diff --git a/external/hyphen/StaticLibrary_hyphen.mk b/external/hyphen/StaticLibrary_hyphen.mk
index 81eddf17d850..e911feb9bef8 100644
--- a/external/hyphen/StaticLibrary_hyphen.mk
+++ b/external/hyphen/StaticLibrary_hyphen.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,hyphen))
$(eval $(call gb_StaticLibrary_use_unpacked,hyphen,hyphen))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,hyphen))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,hyphen))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,hyphen,\
UnpackedTarball/hyphen/hyphen \
diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk
index 9ce87b2398ab..1cdf5f02b6ab 100644
--- a/external/libcmis/StaticLibrary_libcmis.mk
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,libcmis))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libcmis))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,libcmis))
ifeq ($(COM_IS_CLANG),TRUE)
# Avoid narrowing conversion error (even though the option is technically a warning)
diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk
index d4bb5a3e4736..4aa8019d9611 100644
--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_use_externals,etonyek,\
zlib \
))
-$(eval $(call gb_Library_set_warnings_not_errors,etonyek))
+$(eval $(call gb_Library_set_warnings_disabled,etonyek))
$(eval $(call gb_Library_set_precompiled_header,etonyek,$(SRCDIR)/external/libetonyek/inc/pch/precompiled_etonyek))
diff --git a/external/libexttextcat/StaticLibrary_libexttextcat.mk b/external/libexttextcat/StaticLibrary_libexttextcat.mk
index b3301fa73665..1e70f85011ae 100644
--- a/external/libexttextcat/StaticLibrary_libexttextcat.mk
+++ b/external/libexttextcat/StaticLibrary_libexttextcat.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libexttextcat))
$(eval $(call gb_StaticLibrary_use_unpacked,libexttextcat,libexttextcat))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libexttextcat))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,libexttextcat))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,libexttextcat,\
UnpackedTarball/libexttextcat/src/common \
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index e74d30dfb7b3..0dc4e47d60c0 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Library_use_externals,mwaw,\
revenge \
))
-$(eval $(call gb_Library_set_warnings_not_errors,mwaw))
+$(eval $(call gb_Library_set_warnings_disabled,mwaw))
$(eval $(call gb_Library_set_precompiled_header,mwaw,$(SRCDIR)/external/libmwaw/inc/pch/precompiled_mwaw))
diff --git a/external/libnumbertext/StaticLibrary_libnumbertext.mk b/external/libnumbertext/StaticLibrary_libnumbertext.mk
index 838fbd4fd498..78b384a55dd1 100644
--- a/external/libnumbertext/StaticLibrary_libnumbertext.mk
+++ b/external/libnumbertext/StaticLibrary_libnumbertext.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libnumbertext))
$(eval $(call gb_StaticLibrary_use_unpacked,libnumbertext,libnumbertext))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libnumbertext))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,libnumbertext))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,libnumbertext,\
UnpackedTarball/libnumbertext/src/Soros \
diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk
index 952c3ce9b002..946fa9081452 100644
--- a/external/libodfgen/Library_odfgen.mk
+++ b/external/libodfgen/Library_odfgen.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Library_use_externals,odfgen,\
revenge \
))
-$(eval $(call gb_Library_set_warnings_not_errors,odfgen))
+$(eval $(call gb_Library_set_warnings_disabled,odfgen))
$(eval $(call gb_Library_set_include,odfgen,\
-I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \
diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
index 83a4a2f48806..32367b843f68 100644
--- a/external/liborcus/Library_orcus-parser.mk
+++ b/external/liborcus/Library_orcus-parser.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Library_use_externals,orcus-parser,\
zlib \
))
-$(eval $(call gb_Library_set_warnings_not_errors,orcus-parser))
+$(eval $(call gb_Library_set_warnings_disabled,orcus-parser))
$(eval $(call gb_Library_set_include,orcus-parser,\
-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
index 1f026c425244..2b20cdf84ea4 100644
--- a/external/liborcus/Library_orcus.mk
+++ b/external/liborcus/Library_orcus.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_externals,orcus,\
zlib \
))
-$(eval $(call gb_Library_set_warnings_not_errors,orcus))
+$(eval $(call gb_Library_set_warnings_disabled,orcus))
$(eval $(call gb_Library_set_include,orcus,\
-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
index f43a462c7935..cb8428ec4dae 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,libpng))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libpng))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,libpng))
$(eval $(call gb_StaticLibrary_use_unpacked,libpng,libpng))
diff --git a/external/librevenge/Library_revenge.mk b/external/librevenge/Library_revenge.mk
index 19767818190c..4250e4e5778b 100644
--- a/external/librevenge/Library_revenge.mk
+++ b/external/librevenge/Library_revenge.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Library_use_externals,revenge,\
boost_headers \
))
-$(eval $(call gb_Library_set_warnings_not_errors,revenge))
+$(eval $(call gb_Library_set_warnings_disabled,revenge))
$(eval $(call gb_Library_set_include,revenge,\
-I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \
diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk
index 079003e48e48..506ec45f53e2 100644
--- a/external/libstaroffice/Library_staroffice.mk
+++ b/external/libstaroffice/Library_staroffice.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Library_use_externals,staroffice,\
revenge \
))
-$(eval $(call gb_Library_set_warnings_not_errors,staroffice))
+$(eval $(call gb_Library_set_warnings_disabled,staroffice))
$(eval $(call gb_Library_set_include,staroffice,\
-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \
diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk
index 2c84a5b5bb24..0307b374fc3c 100644
--- a/external/libwpd/Library_wpd.mk
+++ b/external/libwpd/Library_wpd.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_externals,wpd,\
revenge \
))
-$(eval $(call gb_Library_set_warnings_not_errors,wpd))
+$(eval $(call gb_Library_set_warnings_disabled,wpd))
$(eval $(call gb_Library_set_include,wpd,\
-I$(call gb_UnpackedTarball_get_dir,libwpd)/inc \
diff --git a/external/libwpg/Library_wpg.mk b/external/libwpg/Library_wpg.mk
index 4eb5c5d8b8fe..09dc34915238 100644
--- a/external/libwpg/Library_wpg.mk
+++ b/external/libwpg/Library_wpg.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_externals,wpg,\
wpd \
))
-$(eval $(call gb_Library_set_warnings_not_errors,wpg))
+$(eval $(call gb_Library_set_warnings_disabled,wpg))
$(eval $(call gb_Library_set_include,wpg,\
-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 9c4f5330fd69..08b0caa9a7fe 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Library_use_externals,wps,\
revenge \
))
-$(eval $(call gb_Library_set_warnings_not_errors,wps))
+$(eval $(call gb_Library_set_warnings_disabled,wps))
$(eval $(call gb_Library_set_include,wps,\
-I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 78641c53d27e..3e35e1d648c5 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,mariadb-connector-c))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mariadb-connector-c))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,mariadb-connector-c))
$(eval $(call gb_StaticLibrary_use_unpacked,mariadb-connector-c,mariadb-connector-c))
diff --git a/external/mdnsresponder/StaticLibrary_mDNSResponder.mk b/external/mdnsresponder/StaticLibrary_mDNSResponder.mk
index 196b0c7baaf8..222776ad3a86 100644
--- a/external/mdnsresponder/StaticLibrary_mDNSResponder.mk
+++ b/external/mdnsresponder/StaticLibrary_mDNSResponder.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,mDNSResponder))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mDNSResponder))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,mDNSResponder))
$(eval $(call gb_StaticLibrary_use_unpacked,mDNSResponder,mDNSResponder))
diff --git a/external/mythes/StaticLibrary_mythes.mk b/external/mythes/StaticLibrary_mythes.mk
index 34411479e63c..74a9e07c4f56 100644
--- a/external/mythes/StaticLibrary_mythes.mk
+++ b/external/mythes/StaticLibrary_mythes.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,mythes))
$(eval $(call gb_StaticLibrary_use_unpacked,mythes,mythes))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mythes))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,mythes))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mythes,\
UnpackedTarball/mythes/mythes \
diff --git a/external/neon/Library_neon.mk b/external/neon/Library_neon.mk
index 2698fe8aeff0..0afd6f4eff81 100644
--- a/external/neon/Library_neon.mk
+++ b/external/neon/Library_neon.mk
@@ -22,13 +22,7 @@ $(eval $(call gb_Library_use_externals,neon,\
$(eval $(call gb_Library_set_visibility_default,neon))
-# neon has its share of warning... let's spare use
-# the pointless spamming
-$(eval $(call gb_Library_add_cflags,neon,\
- -w \
-))
-
-$(eval $(call gb_Library_set_warnings_not_errors,neon))
+$(eval $(call gb_Library_set_warnings_disabled,neon))
$(eval $(call gb_Library_add_generated_cobjects,neon,\
UnpackedTarball/neon/src/ne_207 \
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index acc2f7d38d84..c24894304078 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,pdfium))
$(eval $(call gb_Library_use_unpacked,pdfium,pdfium))
-$(eval $(call gb_Library_set_warnings_not_errors,pdfium))
+$(eval $(call gb_Library_set_warnings_disabled,pdfium))
$(eval $(call gb_Library_set_precompiled_header,pdfium,$(SRCDIR)/external/pdfium/inc/pch/precompiled_pdfium))
@@ -33,14 +33,6 @@ $(eval $(call gb_Library_add_defs,pdfium,\
-DWIN32_LEAN_AND_MEAN \
))
-# Don't show warnings upstream doesn't care about.
-$(eval $(call gb_Library_add_cxxflags,pdfium,\
- -w \
-))
-$(eval $(call gb_Library_add_cflags,pdfium,\
- -w \
-))
-
$(eval $(call gb_Library_set_generated_cxx_suffix,pdfium,cpp))
# pdfium
diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk
index 689db0ecbb74..bdb51ad115da 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,poppler))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
$(eval $(call gb_StaticLibrary_set_include,poppler,\
-I$(WORKDIR)/UnpackedTarball/poppler \
diff --git a/external/redland/Library_raptor.mk b/external/redland/Library_raptor.mk
index 146a46e90cfe..b2779f7dec17 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_use_externals,raptor2,\
libxslt \
))
-$(eval $(call gb_Library_set_warnings_not_errors,raptor2))
+$(eval $(call gb_Library_set_warnings_disabled,raptor2))
$(eval $(call gb_Library_add_defs,raptor2,\
-DHAVE_CONFIG_H \
diff --git a/external/redland/Library_rasqal.mk b/external/redland/Library_rasqal.mk
index 46b37c2116a3..79171d9045fe 100644
--- a/external/redland/Library_rasqal.mk
+++ b/external/redland/Library_rasqal.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,rasqal))
$(eval $(call gb_Library_use_unpacked,rasqal,rasqal))
-$(eval $(call gb_Library_set_warnings_not_errors,rasqal))
+$(eval $(call gb_Library_set_warnings_disabled,rasqal))
$(eval $(call gb_Library_use_external,rasqal,raptor_headers))
diff --git a/external/redland/Library_rdf.mk b/external/redland/Library_rdf.mk
index 9e2f7279fa55..cc427b339834 100644
--- a/external/redland/Library_rdf.mk
+++ b/external/redland/Library_rdf.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_set_include,rdf, \
$(eval $(call gb_Library_use_unpacked,rdf,redland))
-$(eval $(call gb_Library_set_warnings_not_errors,rdf))
+$(eval $(call gb_Library_set_warnings_disabled,rdf))
$(eval $(call gb_Library_use_libraries,rdf,\
raptor2 \
diff --git a/external/ucpp/Executable_ucpp.mk b/external/ucpp/Executable_ucpp.mk
index a2e64e644eed..a4be71c4901c 100644
--- a/external/ucpp/Executable_ucpp.mk
+++ b/external/ucpp/Executable_ucpp.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Executable_Executable,ucpp))
-$(eval $(call gb_Executable_set_warnings_not_errors,ucpp))
+$(eval $(call gb_Executable_set_warnings_disabled,ucpp))
$(eval $(call gb_Executable_use_unpacked,ucpp,ucpp))
@@ -19,12 +19,6 @@ $(eval $(call gb_Executable_add_defs,ucpp,\
-DSTAND_ALONE \
))
-# suppress warning spam
-$(eval $(call gb_Executable_add_cflags,ucpp,\
- -w \
-))
-
-
$(eval $(call gb_Executable_add_generated_cobjects,ucpp,\
UnpackedTarball/ucpp/assert \
UnpackedTarball/ucpp/cpp \
diff --git a/external/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk
index eb309dcc5b7e..f5263bef7d91 100644
--- a/external/zlib/StaticLibrary_zlib.mk
+++ b/external/zlib/StaticLibrary_zlib.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,zlib))
$(eval $(call gb_StaticLibrary_use_unpacked,zlib,zlib))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,zlib))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\
UnpackedTarball/zlib/adler32 \
diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk
index dd16655d1949..a51f326d11df 100644
--- a/external/zlib/StaticLibrary_zlib_x64.mk
+++ b/external/zlib/StaticLibrary_zlib_x64.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_set_x64,zlib_x64,YES))
$(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,zlib_x64))
+$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64))
$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\
-I$(call gb_UnpackedTarball_get_dir,zlib) \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f93c617e9e66..98f05417c5e8 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -477,6 +477,7 @@ gb_CppunitTest_use_externals = $(call gb_CppunitTest__forward_to_Linktarget,$(su
gb_CppunitTest_use_custom_headers = $(call gb_CppunitTest__forward_to_Linktarget,$(subst gb_CppunitTest_,,$(0)),$(1),$(2),$(3))
gb_CppunitTest_set_visibility_default = $(call gb_CppunitTest__forward_to_Linktarget,$(subst gb_CppunitTest_,,$(0)),$(1),$(2),$(3))
gb_CppunitTest_set_warnings_not_errors = $(call gb_CppunitTest__forward_to_Linktarget,$(subst gb_CppunitTest_,,$(0)),$(1),$(2),$(3))
+gb_CppunitTest_set_warnings_disabled = $(call gb_CppunitTest__forward_to_Linktarget,$(subst gb_CppunitTest_,,$(0)),$(1),$(2),$(3))
gb_CppunitTest_set_external_code = $(call gb_CppunitTest__forward_to_Linktarget,$(subst gb_CppunitTest_,,$(0)),$(1),$(2),$(3))
gb_CppunitTest_set_generated_cxx_suffix = $(call gb_CppunitTest__forward_to_Linktarget,$(subst gb_CppunitTest_,,$(0)),$(1),$(2),$(3))
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index c2285f05ac04..94d72529ffb6 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -145,6 +145,7 @@ gb_Executable_add_sdi_headers = $(call gb_Executable__forward_to_Linktarget,$(su
gb_Executable_set_precompiled_header = $(call gb_Executable__forward_to_Linktarget,$(subst gb_Executable_,,$(0)),$(1),$(2),$(3))
gb_Executable_add_nativeres = $(call gb_Executable__forward_to_Linktarget,$(subst gb_Executable_,,$(0)),$(1),$(2),$(3))
gb_Executable_set_warnings_not_errors = $(call gb_Executable__forward_to_Linktarget,$(subst gb_Executable_,,$(0)),$(1),$(2),$(3))
+gb_Executable_set_warnings_disabled = $(call gb_Executable__forward_to_Linktarget,$(subst gb_Executable_,,$(0)),$(1),$(2),$(3))
gb_Executable_set_external_code = $(call gb_Executable__forward_to_Linktarget,$(subst gb_Executable_,,$(0)),$(1),$(2),$(3))
gb_Executable_set_generated_cxx_suffix = $(call gb_Executable__forward_to_Linktarget,$(subst gb_Executable_,,$(0)),$(1),$(2),$(3))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 5166dbe6c390..99688916f4eb 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -230,6 +230,7 @@ gb_Library_add_nativeres = $(call gb_Library__forward_to_Linktarget,$(subst gb_L
gb_Library_set_nativeres = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_set_visibility_default = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_set_warnings_not_errors = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
+gb_Library_set_warnings_disabled = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_set_external_code = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
gb_Library_set_generated_cxx_suffix = $(call gb_Library__forward_to_Linktarget,$(subst gb_Library_,,$(0)),$(1),$(2),$(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7351d070b35c..f1517e40068a 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -788,6 +788,7 @@ $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS :=
$(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
$(call gb_LinkTarget_get_target,$(1)) : VISIBILITY :=
$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS :=
+$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_DISABLED :=
$(call gb_LinkTarget_get_target,$(1)) : PLUGIN_WARNINGS_AS_ERRORS :=
$(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_CODE :=
$(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT :=
@@ -1609,6 +1610,12 @@ $(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS := $(true)
endef
+# call gb_LinkTarget_set_warnings_disabled,linktarget
+define gb_LinkTarget_set_warnings_disabled
+$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_DISABLED := $(true)
+
+endef
+
# call gb_LinkTarget_set_external_code,linktarget
define gb_LinkTarget_set_external_code
$(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_CODE := $(true)
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 2a771aeff849..f3b945fd6b36 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -115,6 +115,7 @@ gb_StaticLibrary_use_static_libraries = $(call gb_StaticLibrary__forward_to_Link
gb_StaticLibrary_add_sdi_headers = $(call gb_StaticLibrary__forward_to_Linktarget,$(subst gb_StaticLibrary_,,$(0)),$(1),$(2),$(3))
gb_StaticLibrary_set_precompiled_header = $(call gb_StaticLibrary__forward_to_Linktarget,$(subst gb_StaticLibrary_,,$(0)),$(1),$(2),$(3))
gb_StaticLibrary_set_warnings_not_errors = $(call gb_StaticLibrary__forward_to_Linktarget,$(subst gb_StaticLibrary_,,$(0)),$(1),$(2),$(3))
+gb_StaticLibrary_set_warnings_disabled = $(call gb_StaticLibrary__forward_to_Linktarget,$(subst gb_StaticLibrary_,,$(0)),$(1),$(2),$(3))
gb_StaticLibrary_set_external_code = $(call gb_StaticLibrary__forward_to_Linktarget,$(subst gb_StaticLibrary_,,$(0)),$(1),$(2),$(3))
gb_StaticLibrary_set_generated_cxx_suffix = $(call gb_StaticLibrary__forward_to_Linktarget,$(subst gb_StaticLibrary_,,$(0)),$(1),$(2),$(3))
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 73c9b1cc4175..5ae811ad81c7 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if $(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR)) \
$(if $(5),$(gb_COMPILER_PLUGINS)) \
$(if $(COMPILER_TEST),-fsyntax-only -ferror-limit=0 -Xclang -verify) \
- $(2) \
+ $(if $(WARNINGS_DISABLED),$(call gb_Helper_disable_warnings,$(2)),$(2)) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
-c $(3) \
-o $(1) \
@@ -97,7 +97,7 @@ $(call gb_Helper_abbreviate_dirs,\
CCACHE_DISABLE=1 $(gb_COMPILER_SETUP) \
$(gb_CXX) \
-x c++-header \
- $(4) $(5) \
+ $(if $(WARNINGS_DISABLED),$(call gb_Helper_disable_warnings,$(4) $(5)),$(4) $(5)) \
$(gb_COMPILERDEPFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
@@ -122,7 +122,7 @@ $(call gb_Helper_abbreviate_dirs,\
CCACHE_DISABLE=1 $(gb_COMPILER_SETUP) \
$(gb_CXX) \
-x c++-header \
- $(4) $(5) \
+ $(if $(WARNINGS_DISABLED),$(call gb_Helper_disable_warnings,$(4) $(5)),$(4) $(5)) \
$(gb_COMPILERDEPFLAGS) \
$(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
$(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index e0862b7fedca..4a4688dd3a1f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -82,6 +82,8 @@ gb_CXXFLAGS_COMMON := \
-fno-common \
-pipe \
+gb_Helper_disable_warnings = $(1) -w
+
ifeq ($(HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED),TRUE)
gb_CXXFLAGS_COMMON += -Wno-maybe-uninitialized
endif
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 705e50a7a563..02f7f44d5143 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -46,7 +46,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(MSVC_CXX) -I$(SRCDIR)/solenv/clang-cl,$(gb_CXX))))) \
$(DEFS) \
$(gb_LTOFLAGS) \
- $(2) \
+ $(if $(WARNINGS_DISABLED),$(call gb_Helper_disable_warnings,$(2)),$(2)) \
$(if $(EXTERNAL_CODE), \
$(if $(filter -clr,$(2)),,$(if $(COM_IS_CLANG),-Wno-undef)), \
$(gb_DEFS_INTERNAL)) \
@@ -82,7 +82,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \
unset INCLUDE && \
$(gb_CXX) \
- $(4) $(5) -Fd$(PDBFILE) \
+ $(if $(WARNINGS_DISABLED),$(call gb_Helper_disable_warnings,$(4) $(5)),$(4) $(5)) \
+ -Fd$(PDBFILE) \
$(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \
$(gb_LTOFLAGS) \
$(gb_COMPILERDEPFLAGS) \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 3a7bbc6557f6..2eb11f697333 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -156,6 +156,8 @@ gb_CFLAGS := \
-wd4800 \
-wd4267 \
+gb_Helper_disable_warnings = $(filter-out -W4,$(1)) -w
+
ifneq ($(COM_IS_CLANG),TRUE)
# clang-cl doesn't support -Wv:18 for now
More information about the Libreoffice-commits
mailing list