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 /download.lst | |
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 'download.lst')
-rw-r--r-- | download.lst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/download.lst b/download.lst index 6ba33582c0c2..001690293bc0 100644 --- a/download.lst +++ b/download.lst @@ -104,10 +104,10 @@ export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz export HYPHEN_SHA256SUM := 304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz -export ICU_SHA256SUM := 627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c -export ICU_TARBALL := icu4c-64_2-src.tgz -export ICU_DATA_SHA256SUM := fba0e89f5b3f285d722a83317647bffee69b6f1eb8d067d5da03c5677c45e510 -export ICU_DATA_TARBALL := icu4c-64_2-data.zip +export ICU_SHA256SUM := 53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948 +export ICU_TARBALL := icu4c-65_1-src.tgz +export ICU_DATA_SHA256SUM := 06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6 +export ICU_DATA_TARBALL := icu4c-65_1-data.zip export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip export JFREEREPORT_FLUTE_SHA256SUM := 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 |