diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 10:34:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 13:05:27 +0200 |
| commit | dcd77e78d5c3b3c855c0588f165bcd4af695101f (patch) | |
| tree | b6b8c59686243f2aaded3f82f8f76e9cfdf65d55 | |
| parent | Pass $(verbose) into ExternalProject_libexttextcat (diff) | |
| download | core-dcd77e78d5c3b3c855c0588f165bcd4af695101f.tar.gz core-dcd77e78d5c3b3c855c0588f165bcd4af695101f.zip | |
external/liborcus: silence -Werror=deprecated-copy (GCC trunk towards GCC 9)
Change-Id: I520b19e2486bf1622206c74649f7105148b7bd87
Reviewed-on: https://gerrit.libreoffice.org/58047
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/gcc9.patch.0 | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 3ab387e734be..215bd4b8cc15 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ external/liborcus/rpath.patch.0 \ + external/liborcus/gcc9.patch.0 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/gcc9.patch.0 b/external/liborcus/gcc9.patch.0 new file mode 100644 index 000000000000..afb9b81c4ea0 --- /dev/null +++ b/external/liborcus/gcc9.patch.0 @@ -0,0 +1,27 @@ +--- include/orcus/types.hpp ++++ include/orcus/types.hpp +@@ -7,6 +7,13 @@ + + #ifndef INCLUDED_ORCUS_TYPES_HPP + #define INCLUDED_ORCUS_TYPES_HPP ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC ++#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang ++#pragma GCC diagnostic ignored "-Wdeprecated-copy" ++#endif + + #include <cstdlib> + #include <vector> +@@ -145,6 +152,10 @@ + typedef ::std::vector<xml_token_attr_t> xml_attrs_t; + + } ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic pop ++#endif + + #endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |