diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 10:29:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 14:43:49 +0200 |
| commit | cec34c9862ebcc2cb60951b690bbdd09d0c6989d (patch) | |
| tree | 94a36a435ac5a1eca4812004c87179d66485b343 /external/icu | |
| parent | xmloff: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9) (diff) | |
| download | core-cec34c9862ebcc2cb60951b690bbdd09d0c6989d.tar.gz core-cec34c9862ebcc2cb60951b690bbdd09d0c6989d.zip | |
external/icu: silence -Werror=deprecated-copy (GCC trunk towards GCC 9)
Change-Id: I43ecb3c0daac421e48433af04b1109bac02cc9aa
Reviewed-on: https://gerrit.libreoffice.org/58044
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/icu')
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 3 | ||||
| -rw-r--r-- | external/icu/gcc9.patch | 27 |
2 files changed, 30 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 0abba05b5bbe..83a2968eb3fd 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -19,6 +19,8 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\ unzip -q -d source -o $(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_DATA_TARBALL) data/misc/icudata.rc \ )) +$(eval $(call gb_UnpackedTarball_set_patchlevel,icu,0)) + $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-build.patch.1 \ external/icu/icu4c-aix.patch.1 \ @@ -34,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \ external/icu/icu4c-khmerbreakengine.patch.1 \ external/icu/icu4c-61-werror-shadow.patch.1 \ + external/icu/gcc9.patch \ )) $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) diff --git a/external/icu/gcc9.patch b/external/icu/gcc9.patch new file mode 100644 index 000000000000..5bacd203586f --- /dev/null +++ b/external/icu/gcc9.patch @@ -0,0 +1,27 @@ +--- source/i18n/unicode/format.h ++++ source/i18n/unicode/format.h +@@ -22,6 +22,13 @@ + + #ifndef FORMAT_H + #define FORMAT_H ++ ++#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 "unicode/utypes.h" +@@ -302,6 +309,10 @@ + U_NAMESPACE_END + + #endif /* #if !UCONFIG_NO_FORMATTING */ ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic pop ++#endif + + #endif // _FORMAT + //eof |