Kaydet (Commit) cec34c98 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst e0e1a2d7
...@@ -19,6 +19,8 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\ ...@@ -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 \ 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,\ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-build.patch.1 \ external/icu/icu4c-build.patch.1 \
external/icu/icu4c-aix.patch.1 \ external/icu/icu4c-aix.patch.1 \
...@@ -34,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ ...@@ -34,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \ $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/icu4c-khmerbreakengine.patch.1 \ external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-61-werror-shadow.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)) $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
......
--- 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment