diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-24 00:22:51 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-24 12:30:42 +0000 |
| commit | 3012156bab9dc0504a61fa7062f8e7cbd677bad4 (patch) | |
| tree | 457afa71770629be870bbec45422b9667618c515 /RepositoryExternal.mk | |
| parent | 5a49362a9c75566568e18fff973635a53b9e594e (diff) | |
icu: un-break installation of Java extensions on Windows (rel. fdo#63756)
Linking libxml2 against ICU libraries has a nasty side effect:
The URE library javavm.dll links against URE libxml2.dll, which
is now linked against OOO icuuc53.dll; when a URE program, like
uno.exe, tries to load javavm.dll it fails because the OOO layer
"program" dir is not on PATH; this breaks the installation of Java
extensions.
Fix that by splitting up ICU libraries and putting the required ones
into URE layer.
(regression from 7515b1a90fac9e31733c0fdcc1156adadf0e6f99)
Change-Id: If98dd0357162cb632d9762cd2d20162de5eb1a52
(cherry picked from commit 057613c6864204ac5c09260e93a8f14cc9768b90)
Reviewed-on: https://gerrit.libreoffice.org/10500
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c149869098b1..ff5059851999 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1393,6 +1393,10 @@ endef else # !SYSTEM_ICU +$(eval $(call gb_Helper_register_packages_for_install,ure, \ + icu_ure \ +)) + $(eval $(call gb_Helper_register_packages_for_install,ooo, \ icu \ )) |