369cb79a99
sberg says: On Windows, implicit --enable-extras first causes a build breaker in workdir/UnpackedTarball/icu/source/extras/scrptrun when linking, because Windows link.exe doesn't understand -o. But even with a patch > --- source/extra/scrptrun/Makefile.in > +++ source/extra/scrptrun/Makefile.in > @@ -74,7 +74,7 @@ > && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status > > $(TARGET) : $(OBJECTS) > - $(LINK.cc) -o $@ $^ $(LIBS) > + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) > $(POST_BUILD_STEP) > > invoke: linking would still fail with a missing ../../lib/icuucdd.lib, which is apparently expanded from $(LIBS) there, but I have no idea where it should be built but isn't. Lets hope that --disable-extras is sufficient for our needs. Change-Id: I6d0117b230caa41abf488fcd069028e3474700f8 Reviewed-on: https://gerrit.libreoffice.org/81632 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
26 lines
535 B
Diff
26 lines
535 B
Diff
--- 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"
|
|
@@ -314,5 +314,9 @@
|
|
|
|
#endif /* U_SHOW_CPLUSPLUS_API */
|
|
|
|
+#ifdef __GNUC__
|
|
+#pragma GCC diagnostic pop
|
|
+#endif
|
|
+
|
|
#endif // _FORMAT
|
|
//eof
|