diff options
| author | Eike Rathke <erack@redhat.com> | 2019-10-29 00:16:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-30 09:14:48 +0100 |
| commit | 369cb79a994dc52de0e1ee02c2d824efcc0c18d3 (patch) | |
| tree | 285abe293afe62739f985054ccb58c507d9cf52f /external/icu/gcc9.patch | |
| parent | f645993593ff931d1659e701487131e3bd1b40f5 (diff) | |
Upgrade to ICU 65.1
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>
Diffstat (limited to 'external/icu/gcc9.patch')
| -rw-r--r-- | external/icu/gcc9.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/external/icu/gcc9.patch b/external/icu/gcc9.patch index 5bacd203586f..5c9808f8c3a3 100644 --- a/external/icu/gcc9.patch +++ b/external/icu/gcc9.patch @@ -14,14 +14,13 @@ #include "unicode/utypes.h" -@@ -302,6 +309,10 @@ - U_NAMESPACE_END +@@ -314,5 +314,9 @@ + + #endif /* U_SHOW_CPLUSPLUS_API */ - #endif /* #if !UCONFIG_NO_FORMATTING */ -+ +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif - ++ #endif // _FORMAT //eof |